X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fdemo.c;h=d6b18ae7a5efe271d973465524f2a457bb7b8940;hb=7b78449e40028fbfaf1f31c630bc3c5bda06a34a;hp=bd9189d648f0c57dd71d2584bb18cd5659133e0a;hpb=cd0de200b17820975637ddafba8a68902648344e;p=libsigrok.git

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index bd9189d6..d6b18ae7 100644
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -98,7 +98,10 @@ struct analog_gen {
 	float amplitude;
 	float pattern_data[ANALOG_BUFSIZE];
 	unsigned int num_samples;
-	struct sr_datafeed_analog_old packet;
+	struct sr_datafeed_analog packet;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	float avg_val; /* Average value */
 	unsigned num_avgs; /* Number of samples averaged */
 };
@@ -323,10 +326,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			/* Every channel gets a generator struct. */
 			ag = g_malloc(sizeof(struct analog_gen));
 			ag->amplitude = DEFAULT_ANALOG_AMPLITUDE;
-			ag->packet.channels = cg->channels;
-			ag->packet.mq = 0;
-			ag->packet.mqflags = 0;
-			ag->packet.unit = SR_UNIT_VOLT;
+			sr_analog_init(&ag->packet, &ag->encoding, &ag->meaning, &ag->spec, 0);
+			ag->packet.meaning->channels = cg->channels;
+			ag->packet.meaning->mq = 0;
+			ag->packet.meaning->mqflags = 0;
+			ag->packet.meaning->unit = SR_UNIT_VOLT;
 			ag->packet.data = ag->pattern_data;
 			ag->pattern = pattern;
 			ag->avg_val = 0.0f;
@@ -671,7 +675,7 @@ static void send_analog_packet(struct analog_gen *ag,
 	unsigned int i;
 
 	devc = sdi->priv;
-	packet.type = SR_DF_ANALOG_OLD;
+	packet.type = SR_DF_ANALOG;
 	packet.payload = &ag->packet;
 
 	if (!devc->avg) {
@@ -817,7 +821,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
 			g_hash_table_iter_init(&iter, devc->ch_ag);
 			while (g_hash_table_iter_next(&iter, NULL, &value)) {
 				ag = value;
-				packet.type = SR_DF_ANALOG_OLD;
+				packet.type = SR_DF_ANALOG;
 				packet.payload = &ag->packet;
 				ag->packet.data = &ag->avg_val;
 				ag->packet.num_samples = 1;
@@ -850,7 +854,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	sr_session_source_add(sdi->session, -1, 0, 100,
 			prepare_data, (struct sr_dev_inst *)sdi);
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* We use this timestamp to decide how many more samples to send. */
 	devc->start_us = g_get_monotonic_time();
@@ -863,7 +867,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
 	sr_dbg("Stopping acquisition.");
 	sr_session_source_remove(sdi->session, -1);
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	return SR_OK;
 }