Fix limit_samples check in various drivers.

[libsigrok.git] / hardware / tondaj-sl-814 / protocol.c

diff --git a/hardware/tondaj-sl-814/protocol.c b/hardware/tondaj-sl-814/protocol.c
index c164289c47cd481efb31a7a16093100e19b86043..e20351ac940f32e6a75636b71a666fb0f2142288 100644 (file)
--- a/hardware/tondaj-sl-814/protocol.c
+++ b/hardware/tondaj-sl-814/protocol.c
@@ -112,6 +112,7 @@ int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
        uint8_t buf[3];
        int ret;
 
+       (void)fd;
        (void)revents;
 
        sdi = cb_data;
@@ -127,14 +128,14 @@ int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
                buf[2] = 0x0d;
                sr_spew("Sending init command: %02x %02x %02x.",
                        buf[0], buf[1], buf[2]);
-               if ((ret = serial_write(fd, buf, 3)) < 0) {
+               if ((ret = serial_write(devc->serial, buf, 3)) < 0) {
                        sr_err("Error sending init command: %d.", ret);
                        return FALSE;
                }
                devc->state = GET_INIT_REPLY;
        } else if (devc->state == GET_INIT_REPLY) {
                /* If we just sent the "init" command, get its reply. */
-               if ((ret = serial_read(fd, buf, 2)) < 0) {
+               if ((ret = serial_read(devc->serial, buf, 2)) < 0) {
                        sr_err("Error reading init reply: %d.", ret);
                        return FALSE;
                }
@@ -153,7 +154,7 @@ int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
                buf[2] = 0x0d;
                sr_spew("Sending data request command: %02x %02x %02x.",
                        buf[0], buf[1], buf[2]);
-               if ((ret = serial_write(fd, buf, 3)) < 0) {
+               if ((ret = serial_write(devc->serial, buf, 3)) < 0) {
                        sr_err("Error sending request command: %d.", ret);
                        return FALSE;
                }
@@ -161,7 +162,7 @@ int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
                devc->state = GET_PACKET;
        } else if (devc->state == GET_PACKET) {
                /* Read a packet from the device. */
-               ret = serial_read(fd, devc->buf + devc->buflen,
+               ret = serial_read(devc->serial, devc->buf + devc->buflen,
                                  4 - devc->buflen);
                if (ret < 0) {
                        sr_err("Error reading packet: %d.", ret);
@@ -193,11 +194,9 @@ int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
        }
 
        /* Stop acquisition if we acquired enough samples. */
-       if (devc->limit_samples > 0) {
-               if (devc->num_samples >= devc->limit_samples) {
-                       sr_info("Requested number of samples reached.");
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
-               }
+       if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
+               sr_info("Requested number of samples reached.");
+               sdi->driver->dev_acquisition_stop(sdi, cb_data);
        }
 
        return TRUE;