beaglelogic: use standard # operator instead of ugly __STRING macro

[libsigrok.git] / src / transform / invert.c

diff --git a/src/transform/invert.c b/src/transform/invert.c
index 98d2240ed961376bdc8ef577fc5a3a52355f66e2..cb7f15d1e108193826fd3d668e1bddb38ed3efc5 100644 (file)
--- a/src/transform/invert.c
+++ b/src/transform/invert.c
@@ -30,8 +30,8 @@ static int receive(const struct sr_transform *t,
                struct sr_datafeed_packet **packet_out)
 {
        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;
        struct sr_channel *ch;
        GSList *l;
        float *fdata, *f;
@@ -54,13 +54,13 @@ static int receive(const struct sr_transform *t,
                        }
                }
                break;
-       case SR_DF_ANALOG:
-               analog = packet_in->payload;
-               fdata = (float *)analog->data;
-               num_channels = g_slist_length(analog->channels);
-               for (si = 0; si < analog->num_samples; si++) {
+       case SR_DF_ANALOG_OLD:
+               analog_old = packet_in->payload;
+               fdata = (float *)analog_old->data;
+               num_channels = g_slist_length(analog_old->channels);
+               for (si = 0; si < analog_old->num_samples; si++) {
                        /* For now invert all values in all channels. */
-                       for (l = analog->channels, c = 0; l; l = l->next, c++) {
+                       for (l = analog_old->channels, c = 0; l; l = l->next, c++) {
                                ch = l->data;
                                (void)ch;
                                f = &fdata[si * num_channels + c];
@@ -68,14 +68,14 @@ static int receive(const struct sr_transform *t,
                        }
                }
                break;
-       case SR_DF_ANALOG2:
-               analog2 = packet_in->payload;
-               p = analog2->encoding->scale.p;
-               q = analog2->encoding->scale.q;
+       case SR_DF_ANALOG:
+               analog = packet_in->payload;
+               p = analog->encoding->scale.p;
+               q = analog->encoding->scale.q;
                if (q > INT64_MAX)
                        return SR_ERR;
-               analog2->encoding->scale.p = (p < 0) ? -q : q;
-               analog2->encoding->scale.q = (p < 0) ? -p : p;
+               analog->encoding->scale.p = (p < 0) ? -q : q;
+               analog->encoding->scale.q = (p < 0) ? -p : p;
                break;
        default:
                sr_spew("Unsupported packet type %d, ignoring.", packet_in->type);