Add a timeout parameter to blocking serial calls.

[libsigrok.git] / src / hardware / openbench-logic-sniffer / api.c

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index a3d653071f5762449fe13fc5f07c30f0fcb144ea..9753d0b619e96179d96065d98ecf22d75d48c4f5 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -161,7 +161,7 @@ static GSList *scan(GSList *options)
 
        if (probefd.revents != G_IO_IN)
                return NULL;
-       if (serial_read_blocking(serial, buf, 4) != 4)
+       if (serial_read_blocking(serial, buf, 4, 0) != 4)
                return NULL;
        if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4))
                return NULL;
@@ -173,12 +173,11 @@ static GSList *scan(GSList *options)
        if (g_poll(&probefd, 1, 10) > 0) {
                /* Got metadata. */
                sdi = get_metadata(serial);
-               sdi->index = 0;
                devc = sdi->priv;
        } else {
                /* Not an OLS -- some other board that uses the sump protocol. */
                sr_info("Device does not support metadata.");
-               sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
+               sdi = sr_dev_inst_new(SR_ST_INACTIVE,
                                "Sump", "Logic Analyzer", "v1.0");
                sdi->driver = di;
                for (i = 0; i < 32; i++) {