X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fvictor-dmm%2Fprotocol.c;fp=src%2Fhardware%2Fvictor-dmm%2Fprotocol.c;h=6f72d9470f1ee0b843599f77720382153f6eec5b;hb=41caa31909882a34b88c8b8a844d555816b78453;hp=1eaffda3e6eb72b2ba770a145a814b8431b63832;hpb=62f155f0c784509dbec98fc7c80b03284a271237;p=libsigrok.git

diff --git a/src/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c
index 1eaffda3..6f72d947 100644
--- a/src/hardware/victor-dmm/protocol.c
+++ b/src/hardware/victor-dmm/protocol.c
@@ -167,10 +167,7 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
 	if (minus)
 		fvalue = -fvalue;
 
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog2));
-	memset(&encoding, 0, sizeof(struct sr_analog_encoding));
-	memset(&meaning, 0, sizeof(struct sr_analog_meaning));
-	memset(&spec, 0, sizeof(struct sr_analog_spec));
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 4);
 
 	/* Measurement mode */
 	meaning.channels = sdi->channels;
@@ -259,27 +256,8 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
 	if (is_relative)
 		meaning.mqflags |= SR_MQFLAG_RELATIVE;
 
-	encoding.unitsize = sizeof(float);
-	encoding.is_float = TRUE;
-#ifdef WORDS_BIGENDIAN
-	encoding.is_bigendian = TRUE;
-#else
-	encoding.is_bigendian = FALSE;
-#endif
-	encoding.digits = 4; /* Values are always 4-digit numbers. */
-	encoding.is_digits_decimal = TRUE;
-	encoding.scale.p = 1;
-	encoding.scale.q = 1;
-	encoding.offset.p = 0;
-	encoding.offset.q = 1;
-
-	spec.spec_digits = encoding.digits;
-
 	analog.data = &fvalue;
 	analog.num_samples = 1;
-	analog.encoding = &encoding;
-	analog.meaning = &meaning;
-	analog.spec = &spec;
 
 	packet.type = SR_DF_ANALOG2;
 	packet.payload = &analog;