X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fprotocol.c;h=96d26a65085e302f2751ed30b874d5b4e71f47a5;hb=8be8746951e5538147370d9871a4c1ed0268db52;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..96d26a65 100644
--- 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;
@@ -236,7 +237,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,6 +252,10 @@ 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);
 		}