output/csv: Drop support for SR_DF_ANALOG_OLD.

[libsigrok.git] / src / output / csv.c

diff --git a/src/output/csv.c b/src/output/csv.c
index 250e6cf475ce693f1a1e01cbcf4c1df78f76e991..00265870be0b35ffcb2a022f8808daf372c4dc04 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -192,8 +192,7 @@ 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_analog2 *analog2;
+       const struct sr_datafeed_analog *analog;
        const struct sr_config *src;
        unsigned int num_samples;
        float *data;
@@ -268,25 +267,15 @@ 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_ANALOG2:
-               analog_old = packet->payload;
-               analog2 = packet->payload;
-
-               if (packet->type == SR_DF_ANALOG_OLD) {
-                       channels = analog_old->channels;
-                       numch = g_slist_length(channels);
-                       num_samples = analog_old->num_samples;
-                       data = analog_old->data;
-               } else {
-                       channels = analog2->meaning->channels;
-                       numch = g_slist_length(channels);
-                       num_samples = analog2->num_samples;
-                       data = g_malloc(sizeof(float) * num_samples * numch);
-                       ret = sr_analog_to_float(analog2, data);
-                       if (ret != SR_OK)
-                               return ret;
-               }
+       case SR_DF_ANALOG:
+               analog = packet->payload;
+               channels = analog->meaning->channels;
+               numch = g_slist_length(channels);
+               num_samples = analog->num_samples;
+               data = g_malloc(sizeof(float) * num_samples * numch);
+               ret = sr_analog_to_float(analog, data);
+               if (ret != SR_OK)
+                       return ret;
 
                if (ctx->inframe) {
                        handle_analog_frame(ctx, channels, num_samples, data);