ols: Fix a compiler warning (unused variable).

[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 02cc02b52a53762bd8a8f812f23b00b46ab02276..ca5f4799c584d5f42989e36dd5670055bd5f093d 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -100,7 +100,6 @@ static GSList *scan(GSList *options)
        struct dev_context *devc;
        struct sr_channel *ch;
        struct sr_serial_dev_inst *serial;
-       GPollFD probefd;
        GSList *l, *devices;
        int ret, i;
        const char *conn, *serialcomm;
@@ -128,8 +127,7 @@ static GSList *scan(GSList *options)
        if (serialcomm == NULL)
                serialcomm = SERIALCOMM;
 
-       if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-               return NULL;
+       serial = sr_serial_dev_inst_new(conn, serialcomm);
 
        /* The discovery procedure is like this: first send the Reset
         * command (0x00) 5 times, since the device could be anywhere
@@ -158,22 +156,32 @@ static GSList *scan(GSList *options)
        /* Wait 10ms for a response. */
        g_usleep(10000);
 
-       sp_get_port_handle(serial->data, &probefd.fd);
-       probefd.events = G_IO_IN;
-       g_poll(&probefd, 1, 1);
-
-       if (probefd.revents != G_IO_IN)
+       if (sp_input_waiting(serial->data) == 0) {
+               sr_dbg("Didn't get any reply.");
                return NULL;
-       if (serial_read_blocking(serial, buf, 4, serial_timeout(serial, 4)) != 4)
+       }
+
+       ret = serial_read_blocking(serial, buf, 4, serial_timeout(serial, 4));
+       if (ret != 4) {
+               sr_err("Invalid reply (expected 4 bytes, got %d).", ret);
                return NULL;
-       if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4))
+       }
+
+       if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4)) {
+               sr_err("Invalid reply (expected '1SLO' or '1ALS', got "
+                      "'%c%c%c%c').", buf[0], buf[1], buf[2], buf[3]);
                return NULL;
+       }
 
        /* Definitely using the OLS protocol, check if it supports
         * the metadata command.
         */
        send_shortcommand(serial, CMD_METADATA);
-       if (g_poll(&probefd, 1, 10) > 0) {
+
+       /* Wait 10ms for a response. */
+       g_usleep(10000);
+
+       if (sp_input_waiting(serial->data) != 0) {
                /* Got metadata. */
                sdi = get_metadata(serial);
                devc = sdi->priv;
@@ -187,9 +195,8 @@ static GSList *scan(GSList *options)
                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,
-                                       ols_channel_names[i])))
-                               return 0;
+                       ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+                                       ols_channel_names[i]);
                        sdi->channels = g_slist_append(sdi->channels, ch);
                }
                devc = ols_dev_new();