brymen-dmm: Convert to SR_DF_ANALOG.

[libsigrok.git] / src / hardware / brymen-dmm / protocol.c

diff --git a/src/hardware/brymen-dmm/protocol.c b/src/hardware/brymen-dmm/protocol.c
index 3e1b84c421834030b777fe1b9fd7ee347bbd5e2f..4cd61ad694f52cd8eee326402d7c1ac9c92f8314 100644 (file)
--- a/src/hardware/brymen-dmm/protocol.c
+++ b/src/hardware/brymen-dmm/protocol.c
@@ -25,22 +25,27 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
        float floatval;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog_old analog;
+       struct sr_datafeed_analog analog;
+       struct sr_analog_encoding encoding;
+       struct sr_analog_meaning meaning;
+       struct sr_analog_spec spec;
 
        devc = sdi->priv;
 
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
        analog.num_samples = 1;
-       analog.mq = -1;
+       analog.meaning->mq = 0;
 
        if (brymen_parse(buf, &floatval, &analog, NULL) != SR_OK)
                return;
        analog.data = &floatval;
 
-       analog.channels = sdi->channels;
+       analog.meaning->channels = sdi->channels;
 
-       if (analog.mq != -1) {
+       if (analog.meaning->mq != 0) {
                /* Got a measurement. */
-               packet.type = SR_DF_ANALOG_OLD;
+               packet.type = SR_DF_ANALOG;
                packet.payload = &analog;
                sr_session_send(sdi, &packet);
                sr_sw_limits_update_samples_read(&devc->sw_limits, 1);