X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fvictor-dmm%2Fprotocol.c;h=b0eb384ad24d306f0b917bab8ae17799e25feb64;hb=62974b235a5c5aeaacad5d28a50aef39f528dccd;hp=1eaffda3e6eb72b2ba770a145a814b8431b63832;hpb=a84a26d98ace158fa9e0b0e6d385928ceb91221a;p=libsigrok.git
diff --git a/src/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c
index 1eaffda3..b0eb384a 100644
--- a/src/hardware/victor-dmm/protocol.c
+++ b/src/hardware/victor-dmm/protocol.c
@@ -17,10 +17,11 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "protocol.h"
@@ -43,7 +44,7 @@ static uint8_t decode_digit(uint8_t in)
static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog2 analog;
+ struct sr_datafeed_analog analog;
struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
@@ -167,10 +168,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,29 +257,10 @@ 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.type = SR_DF_ANALOG;
packet.payload = &analog;
sr_session_send(devc->cb_data, &packet);