Fix limit_samples check in various drivers.

[libsigrok.git] / hardware / uni-t-dmm / protocol.c

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index d4aaba5f9b714240b2e4d2766dd554af8992b1be..55f573afdcb0e18e1216cf0c391016396f77bc21 100644 (file)
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -70,6 +70,7 @@ static void decode_packet(struct dev_context *devc, int dmm, const uint8_t *buf)
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
+       struct fs9721_info info;
        float floatval;
        int ret;
 
@@ -79,7 +80,7 @@ static void decode_packet(struct dev_context *devc, int dmm, const uint8_t *buf)
        if (dmm == UNI_T_UT61D)
                ret = sr_dmm_parse_fs9922(buf, &floatval, &analog);
        else if (dmm == VOLTCRAFT_VC820)
-               ret = sr_dmm_parse_fs9721(buf, &floatval, &analog);
+               ret = sr_fs9721_parse(buf, &floatval, &analog, &info);
        if (ret != SR_OK) {
                sr_err("Invalid DMM packet, ignoring.");
                return;
@@ -105,7 +106,8 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate)
        if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) {
                ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0);
                if (ret < 0) {
-                       sr_err("Failed to detach kernel driver: %d.", ret);
+                       sr_err("Failed to detach kernel driver: %s.",
+                              libusb_error_name(ret));
                        return SR_ERR;
                }
                sr_dbg("Successfully detached kernel driver.");
@@ -115,7 +117,8 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate)
 
        /* Claim interface 0. */
        if ((ret = libusb_claim_interface(devc->usb->devhdl, 0)) < 0) {
-               sr_err("Failed to claim interface 0: %d.", ret);
+               sr_err("Failed to claim interface 0: %s.",
+                      libusb_error_name(ret));
                return SR_ERR;
        }
        sr_dbg("Successfully claimed interface 0.");
@@ -144,7 +147,7 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate)
                1000 /* timeout (ms) */);
 
        if (ret < 0) {
-               sr_err("HID feature report error: %d.", ret);
+               sr_err("HID feature report error: %s.", libusb_error_name(ret));
                return SR_ERR;
        }
 
@@ -215,7 +218,7 @@ static int uni_t_dmm_receive_data(int fd, int revents, int dmm, void *cb_data)
                1000 /* timeout (ms) */);
 
        if (ret < 0) {
-               sr_err("USB receive error: %d.", ret);
+               sr_err("USB receive error: %s.", libusb_error_name(ret));
                return FALSE;
        }
 
@@ -236,7 +239,7 @@ static int uni_t_dmm_receive_data(int fd, int revents, int dmm, void *cb_data)
                                        return TRUE;
                        } else if (dmm == VOLTCRAFT_VC820) {
                                /* Valid packets have 0x1 as high nibble. */
-                               if ((buf[1] & 0xf0) != 0x10)
+                               if (!sr_fs9721_is_packet_start(buf[1]))
                                        return TRUE;
                        }
                        synced_on_first_packet = TRUE;
@@ -251,13 +254,17 @@ static int uni_t_dmm_receive_data(int fd, int revents, int dmm, void *cb_data)
                if (data_byte_counter == NUM_DATA_BYTES) {
                        log_dmm_packet(pbuf);
                        data_byte_counter = 0;
+                       if (!sr_fs9721_packet_valid(pbuf)) {
+                               sr_err("Invalid packet.");
+                               return TRUE;
+                       }
                        decode_packet(devc, dmm, pbuf);
                        memset(pbuf, 0x00, NUM_DATA_BYTES);
                }
        }
 
        /* Abort acquisition if we acquired enough samples. */
-       if (devc->num_samples >= devc->limit_samples && devc->limit_samples > 0) {
+       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);
        }