From: Uwe Hermann <redacted>
Date: Sat, 28 May 2016 15:41:35 +0000 (+0200)
Subject: fx2lafw: Convert to SR_DF_ANALOG.
X-Git-Tag: libsigrok-0.5.0~328
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a6ad49b39f701a0617e6faa6a3944136e4d9feb6;p=libsigrok.git

fx2lafw: Convert to SR_DF_ANALOG.
---

diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index 8e69b77f..29bb0df5 100644
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -390,6 +390,10 @@ SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi,
 {
 	size_t i;
 	struct dev_context *devc;
+	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 
 	(void)sample_width;
 
@@ -417,17 +421,16 @@ SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi,
 
 	sr_session_send(sdi, &logic_packet);
 
-	const struct sr_datafeed_analog_old analog = {
-		.channels = devc->enabled_analog_channels,
-		.num_samples = length,
-		.mq = SR_MQ_VOLTAGE,
-		.unit = SR_UNIT_VOLT,
-		.mqflags = 0 /*SR_MQFLAG_DC*/,
-		.data = devc->analog_buffer
-	};
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+	analog.meaning->channels = devc->enabled_analog_channels;
+	analog.meaning->mq = SR_MQ_VOLTAGE;
+	analog.meaning->unit = SR_UNIT_VOLT;
+	analog.meaning->mqflags = 0 /* SR_MQFLAG_DC */;
+	analog.num_samples = length;
+	analog.data = devc->analog_buffer;
 
 	const struct sr_datafeed_packet analog_packet = {
-		.type = SR_DF_ANALOG_OLD,
+		.type = SR_DF_ANALOG,
 		.payload = &analog
 	};