X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fvictor-dmm%2Fprotocol.c;h=ad78224fab1461c73c8ab780f899f4ad15a672db;hb=69e19dd7691f86ac001469d1b319e1358e0d9778;hp=6a82d339756807b613691483df48f31108026b4b;hpb=b1a051544d502f15a1da05682e625755563b86c2;p=libsigrok.git

diff --git a/hardware/victor-dmm/protocol.c b/hardware/victor-dmm/protocol.c
index 6a82d339..ad78224f 100644
--- a/hardware/victor-dmm/protocol.c
+++ b/hardware/victor-dmm/protocol.c
@@ -40,16 +40,19 @@ static uint8_t decode_digit(uint8_t in)
 	return out;
 }
 
-static void decode_buf(struct dev_context *devc, unsigned char *data)
+static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
+	struct dev_context *devc;
 	long factor, ivalue;
 	uint8_t digits[4];
 	gboolean is_duty, is_continuity, is_diode, is_ac, is_dc, is_auto;
 	gboolean is_hold, is_max, is_min, is_relative, minus;
 	float fvalue;
 
+	devc = sdi->priv;
+
 	digits[0] = decode_digit(data[12]);
 	digits[1] = decode_digit(data[11]);
 	digits[2] = decode_digit(data[10]);
@@ -249,6 +252,7 @@ static void decode_buf(struct dev_context *devc, unsigned char *data)
 	if (is_relative)
 		analog.mqflags |= SR_MQFLAG_RELATIVE;
 
+	analog.probes = sdi->probes;
 	analog.num_samples = 1;
 	analog.data = &fvalue;
 	packet.type = SR_DF_ANALOG;
@@ -260,7 +264,6 @@ static void decode_buf(struct dev_context *devc, unsigned char *data)
 
 SR_PRIV int victor_dmm_receive_data(struct sr_dev_inst *sdi, unsigned char *buf)
 {
-	struct dev_context *devc;
 	GString *dbg;
 	int i;
 	unsigned char data[DMM_DATA_SIZE];
@@ -269,8 +272,6 @@ SR_PRIV int victor_dmm_receive_data(struct sr_dev_inst *sdi, unsigned char *buf)
 		6, 13, 5, 11, 2, 7, 9, 8, 3, 10, 12, 0, 4, 1
 	};
 
-	devc = sdi->priv;
-
 	for (i = 0; i < DMM_DATA_SIZE && buf[i] == 0; i++);
 	if (i == DMM_DATA_SIZE) {
 		/* This DMM outputs all zeroes from time to time, just ignore it. */
@@ -291,7 +292,7 @@ SR_PRIV int victor_dmm_receive_data(struct sr_dev_inst *sdi, unsigned char *buf)
 		g_string_free(dbg, TRUE);
 	}
 
-	decode_buf(devc, data);
+	decode_buf(sdi, data);
 
 	return SR_OK;
 }