ipdbg-la: Allow rx to time out and handle invalid data properly

[libsigrok.git] / src / hardware / ipdbg-logic-analyser / api.c

diff --git a/src/hardware/ipdbg-logic-analyser/api.c b/src/hardware/ipdbg-logic-analyser/api.c
index f48caf6ab4e4cf60404fd56a1a51633714628245..81d28337ecca3ac6d80ba5c5afb64ec9274b106b 100644 (file)
--- a/src/hardware/ipdbg-logic-analyser/api.c
+++ b/src/hardware/ipdbg-logic-analyser/api.c
@@ -26,13 +26,12 @@ static const uint32_t ipdbg_org_la_drvopts[] = {
 
 static const uint32_t ipdbg_org_la_scanopts[] = {
        SR_CONF_CONN,
-       SR_CONF_SERIALCOMM,
 };
 
 static const uint32_t ipdbg_org_la_devopts[] = {
        SR_CONF_TRIGGER_MATCH | SR_CONF_LIST | SR_CONF_SET,
        SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
-       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET
+       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET,
 };
 
 static const int32_t ipdbg_org_la_trigger_matches[] = {
@@ -93,7 +92,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        ipdbg_org_la_send_reset(tcp);
        ipdbg_org_la_send_reset(tcp);
-       ipdbg_org_la_request_id(tcp);
+
+       if (ipdbg_org_la_request_id(tcp) != SR_OK)
+               return NULL;
 
        struct sr_dev_inst *sdi = g_malloc0(sizeof(struct sr_dev_inst));
        if (!sdi) {