From: Uwe Hermann <redacted>
Date: Sat, 14 May 2016 15:14:53 +0000 (+0200)
Subject: agilent-dmm: Convert to SR_DF_ANALOG.
X-Git-Tag: libsigrok-0.5.0~339
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=16aef676340f028a06e77f45d76511cc78a18803;p=libsigrok.git

agilent-dmm: Convert to SR_DF_ANALOG.
---

diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index 47e38fb2..27da6b93 100644
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -130,7 +130,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			devc = g_malloc0(sizeof(struct dev_context));
 			sr_sw_limits_init(&devc->limits);
 			devc->profile = &supported_agdmm[i];
-			devc->cur_mq = -1;
+			devc->cur_mq = 0;
 			sdi->inst_type = SR_INST_SERIAL;
 			sdi->conn = serial;
 			sdi->priv = devc;
diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c
index c3dab0b7..0dd1c71d 100644
--- a/src/hardware/agilent-dmm/sched.c
+++ b/src/hardware/agilent-dmm/sched.c
@@ -264,7 +264,10 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
 {
 	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;
 	float fvalue;
 	const char *s;
 	char *mstr;
@@ -296,14 +299,14 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
 			fvalue /= devc->cur_divider;
 	}
 
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
-	analog.mq = devc->cur_mq;
-	analog.unit = devc->cur_unit;
-	analog.mqflags = devc->cur_mqflags;
-	analog.channels = sdi->channels;
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+	analog.meaning->mq = devc->cur_mq;
+	analog.meaning->unit = devc->cur_unit;
+	analog.meaning->mqflags = devc->cur_mqflags;
+	analog.meaning->channels = sdi->channels;
 	analog.num_samples = 1;
 	analog.data = &fvalue;
-	packet.type = SR_DF_ANALOG_OLD;
+	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
 	sr_session_send(sdi, &packet);