dmm: Convert to SR_DF_ANALOG.

[libsigrok.git] / src / dmm / ut372.c

diff --git a/src/dmm/ut372.c b/src/dmm/ut372.c
index 74f8757555c15abbe5a2d55ba2886950d7a419b6..41d5a62b95f3f8602d58e4c56df1ea750faacdde 100644 (file)
--- a/src/dmm/ut372.c
+++ b/src/dmm/ut372.c
@@ -88,7 +88,7 @@ SR_PRIV gboolean sr_ut372_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval,
-               struct sr_datafeed_analog_old *analog, void *info)
+               struct sr_datafeed_analog *analog, void *info)
 {
        unsigned int i, j, value, divisor;
        uint8_t segments, flags1, flags2;
@@ -99,21 +99,21 @@ SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval,
        flags2 = decode_pair(buf + 23);
 
        if (flags2 & FLAGS2_RPM_MASK) {
-               analog->mq = SR_MQ_FREQUENCY;
-               analog->unit = SR_UNIT_REVOLUTIONS_PER_MINUTE;
+               analog->meaning->mq = SR_MQ_FREQUENCY;
+               analog->meaning->unit = SR_UNIT_REVOLUTIONS_PER_MINUTE;
        } else if (flags2 & FLAGS2_COUNT_MASK) {
-               analog->mq = SR_MQ_COUNT;
-               analog->unit = SR_UNIT_UNITLESS;
+               analog->meaning->mq = SR_MQ_COUNT;
+               analog->meaning->unit = SR_UNIT_UNITLESS;
        }
 
        if (flags1 & FLAGS1_HOLD_MASK)
-               analog->mqflags |= SR_MQFLAG_HOLD;
+               analog->meaning->mqflags |= SR_MQFLAG_HOLD;
        if (flags2 & FLAGS2_MIN_MASK)
-               analog->mqflags |= SR_MQFLAG_MIN;
+               analog->meaning->mqflags |= SR_MQFLAG_MIN;
        if (flags2 & FLAGS2_MAX_MASK)
-               analog->mqflags |= SR_MQFLAG_MAX;
+               analog->meaning->mqflags |= SR_MQFLAG_MAX;
        if (flags2 & FLAGS2_AVG_MASK)
-               analog->mqflags |= SR_MQFLAG_AVG;
+               analog->meaning->mqflags |= SR_MQFLAG_AVG;
 
        value = 0;
        divisor = 1;