drivers: Fix behaviour when trying to set an invalid capture ratio.

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

diff --git a/src/output/analog.c b/src/output/analog.c
index 82e7ad9c20b167d8c29292025e6a617a6e664b20..4535ed5ca76267ef75cd07829b2bbc381ad78a8a 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -95,6 +96,7 @@ static void si_printf(float value, GString *out, char *unitstr)
 
 }
 
+/* Please use the same order as in enum sr_unit (libsigrok.h). */
 static void fancyprint(int unit, int mqflags, float value, GString *out)
 {
        switch (unit) {
@@ -241,6 +243,7 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
                break;
        }
 
+       /* Please use the same order as in enum sr_mqflag (libsigrok.h). */
        if (mqflags & SR_MQFLAG_AC)
                g_string_append_printf(out, " AC");
        if (mqflags & SR_MQFLAG_DC)
@@ -275,8 +278,8 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                GString **out)
 {
        struct context *ctx;
+       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;
@@ -296,40 +299,41 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
        case SR_DF_FRAME_END:
                *out = g_string_new("FRAME-END\n");
                break;
-       case SR_DF_ANALOG:
-               analog = packet->payload;
-               fdata = (float *)analog->data;
+       case SR_DF_ANALOG_OLD:
+               analog_old = packet->payload;
+               fdata = (float *)analog_old->data;
                *out = g_string_sized_new(512);
-               num_channels = g_slist_length(analog->channels);
-               for (si = 0; si < analog->num_samples; si++) {
-                       for (l = analog->channels, c = 0; l; l = l->next, c++) {
+               num_channels = g_slist_length(analog_old->channels);
+               for (si = 0; si < analog_old->num_samples; si++) {
+                       for (l = analog_old->channels, c = 0; l; l = l->next, c++) {
                                ch = l->data;
                                g_string_append_printf(*out, "%s: ", ch->name);
-                               fancyprint(analog->unit, analog->mqflags,
+                               fancyprint(analog_old->unit, analog_old->mqflags,
                                                fdata[si * num_channels + c], *out);
                        }
                }
                break;
-       case SR_DF_ANALOG2:
-               analog2 = packet->payload;
-               if (!(fdata = g_try_malloc(analog2->num_samples * sizeof(float))))
+       case SR_DF_ANALOG:
+               analog = packet->payload;
+               num_channels = g_slist_length(analog->meaning->channels);
+               if (!(fdata = g_try_malloc(
+                                               analog->num_samples * num_channels * sizeof(float))))
                        return SR_ERR_MALLOC;
-               if ((ret = sr_analog_to_float(analog2, fdata)) != SR_OK)
+               if ((ret = sr_analog_to_float(analog, fdata)) != SR_OK)
                        return ret;
                *out = g_string_sized_new(512);
-               if (analog2->encoding->is_digits_decimal) {
+               if (analog->encoding->is_digits_decimal) {
                        if (ctx->digits == DIGITS_ALL)
-                               digits = analog2->encoding->digits;
+                               digits = analog->encoding->digits;
                        else
-                               digits = analog2->spec->spec_digits;
+                               digits = analog->spec->spec_digits;
                } else {
                        /* TODO we don't know how to print by number of bits yet. */
                        digits = 6;
                }
-               sr_analog_unit_to_string(analog2, &suffix);
-               num_channels = g_slist_length(analog2->meaning->channels);
-               for (i = 0; i < analog2->num_samples; i++) {
-                       for (l = analog2->meaning->channels, c = 0; l; l = l->next, c++) {
+               sr_analog_unit_to_string(analog, &suffix);
+               for (i = 0; i < analog->num_samples; i++) {
+                       for (l = analog->meaning->channels, c = 0; l; l = l->next, c++) {
                                ch = l->data;
                                g_string_append_printf(*out, "%s: ", ch->name);
                                sr_analog_float_to_string(fdata[i * num_channels + c],