X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fprotocol.c;h=929ba9ecf6a42a382a2c8bc33d96f81d11a7893a;hb=fb6e5ba8c7da4cc16eda03e3ffd0a97780655442;hp=d4aaba5f9b714240b2e4d2766dd554af8992b1be;hpb=fdbcb86dba17eec8e1492736adf1aec45e746c00;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index d4aaba5f..929ba9ec 100644
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -70,16 +70,18 @@ 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;
 
 	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
 
 	/* Parse the protocol packet. */
+	ret = SR_ERR;
 	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 +107,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 +118,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 +148,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 +219,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 +240,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 +255,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);
 	}