X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=db023a476050c59ffdb88ef144c8a84377413442;hb=74a9c0adc04fd76f68e8ad5a3d3fbde0f873f849;hp=9eff8238b5f4eb8c5fee0d4b097fb41cccae3614;hpb=453629c1375ff86494f44129aaebbc618b8830cf;p=libsigrok.git

diff --git a/src/output/csv.c b/src/output/csv.c
index 9eff8238..db023a47 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -192,8 +192,8 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 {
 	const struct sr_datafeed_meta *meta;
 	const struct sr_datafeed_logic *logic;
+	const struct sr_datafeed_analog_old *analog_old;
 	const struct sr_datafeed_analog *analog;
-	const struct sr_datafeed_analog2 *analog2;
 	const struct sr_config *src;
 	unsigned int num_samples;
 	float *data;
@@ -268,22 +268,22 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 			g_string_append_printf(*out, "\n");
 		}
 		break;
+	case SR_DF_ANALOG_OLD:
 	case SR_DF_ANALOG:
-	case SR_DF_ANALOG2:
+		analog_old = packet->payload;
 		analog = packet->payload;
-		analog2 = packet->payload;
 
-		if (packet->type == SR_DF_ANALOG) {
-			channels = analog->channels;
+		if (packet->type == SR_DF_ANALOG_OLD) {
+			channels = analog_old->channels;
 			numch = g_slist_length(channels);
-			num_samples = analog->num_samples;
-			data = analog->data;
+			num_samples = analog_old->num_samples;
+			data = analog_old->data;
 		} else {
-			channels = analog2->meaning->channels;
+			channels = analog->meaning->channels;
 			numch = g_slist_length(channels);
-			num_samples = analog2->num_samples;
+			num_samples = analog->num_samples;
 			data = g_malloc(sizeof(float) * num_samples * numch);
-			ret = sr_analog_to_float(analog2, data);
+			ret = sr_analog_to_float(analog, data);
 			if (ret != SR_OK)
 				return ret;
 		}