Change sr_dev_inst_new() to take no parameters.

[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 25f296ebb6db4532c1ede91ccf9d97d719473005..174d333d5e4f232f6f31dd02cb34b9c74ad2f2e6 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -135,7 +135,7 @@ static GSList *scan(GSList *options)
         * have a match.
         */
        sr_info("Probing %s.", conn);
-       if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+       if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
        ret = SR_OK;
@@ -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, serial_timeout(serial, 4)) != 4)
                return NULL;
        if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4))
                return NULL;
@@ -173,13 +173,15 @@ 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,
-                               "Sump", "Logic Analyzer", "v1.0");
+               sdi = sr_dev_inst_new();
+               sdi->status = SR_ST_INACTIVE;
+               sdi->vendor = g_strdup("Sump");
+               sdi->model = g_strdup("Logic Analyzer");
+               sdi->version = g_strdup("v1.0");
                sdi->driver = di;
                for (i = 0; i < 32; i++) {
                        if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,