input/raw_analog: Use ARRAY_SIZE.

[libsigrok.git] / src / input / raw_analog.c

diff --git a/src/input/raw_analog.c b/src/input/raw_analog.c
index 9be40b623287a500ab5837c875ab008dd4aaa75c..bb1aa06bdadf8d552df67d802e44ab94dbc779c3 100644 (file)
--- a/src/input/raw_analog.c
+++ b/src/input/raw_analog.c
@@ -48,36 +48,31 @@ struct context {
 };
 
 struct sample_format {
-       const char const* fmt_name;
-       // same as struct sr_analog_encoding
-       uint8_t unitsize;
-       gboolean is_signed;
-       gboolean is_float;
-       gboolean is_bigendian;
+       const char const *fmt_name;
+       struct sr_analog_encoding encoding;
 };
 
 static const struct sample_format const sample_formats[] =
 {
-       { "S8",     1, TRUE,  FALSE, FALSE },
-       { "U8",     1, FALSE, FALSE, FALSE },
-       { "S16_LE", 2, TRUE,  FALSE, FALSE },
-       { "U16_LE", 2, FALSE, FALSE, FALSE },
-       { "S16_BE", 2, TRUE,  FALSE, TRUE },
-       { "U16_BE", 2, FALSE, FALSE, TRUE },
-       { "S32_LE", 4, TRUE,  FALSE, FALSE },
-       { "U32_LE", 4, FALSE, FALSE, FALSE },
-       { "S32_BE", 4, TRUE,  FALSE, TRUE },
-       { "U32_BE", 4, FALSE, FALSE, TRUE },
-       { "FLOAT_LE", 4, TRUE, TRUE, FALSE },
-       { "FLOAT_BE", 4, TRUE, TRUE, TRUE },
-       { "FLOAT64_LE", 8, TRUE, TRUE, FALSE },
-       { "FLOAT64_BE", 8, TRUE, TRUE, TRUE },
+       { "S8",         { 1, TRUE,  FALSE, FALSE, 0, TRUE, { 1,         128}, { 0, 1}}},
+       { "U8",         { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1,         255}, {-1, 2}}},
+       { "S16_LE",     { 2, TRUE,  FALSE, FALSE, 0, TRUE, { 1, INT16_MAX+1}, { 0, 1}}},
+       { "U16_LE",     { 2, FALSE, FALSE, FALSE, 0, TRUE, { 1,  UINT16_MAX}, {-1, 2}}},
+       { "S16_BE",     { 2, TRUE,  FALSE, TRUE,  0, TRUE, { 1, INT16_MAX+1}, { 0, 1}}},
+       { "U16_BE",     { 2, FALSE, FALSE, TRUE,  0, TRUE, { 1,  UINT16_MAX}, {-1, 2}}},
+       { "S32_LE",     { 4, TRUE,  FALSE, FALSE, 0, TRUE, { 1, INT32_MAX+1}, { 0, 1}}},
+       { "U32_LE",     { 4, FALSE, FALSE, FALSE, 0, TRUE, { 1,  UINT32_MAX}, {-1, 2}}},
+       { "S32_BE",     { 4, TRUE,  FALSE, TRUE,  0, TRUE, { 1, INT32_MAX+1}, { 0, 1}}},
+       { "U32_BE",     { 4, FALSE, FALSE, TRUE,  0, TRUE, { 1,  UINT32_MAX}, {-1, 2}}},
+       { "FLOAT_LE",   { 4, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,           1}, { 0, 1}}},
+       { "FLOAT_BE",   { 4, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,           1}, { 0, 1}}},
+       { "FLOAT64_LE", { 8, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,           1}, { 0, 1}}},
+       { "FLOAT64_BE", { 8, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,           1}, { 0, 1}}},
 };
 
 static int parse_format_string(const char *format)
 {
-       int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
-       for (int i = 0; i < num_formats; i++) {
+       for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++) {
                if (!strcmp(format, sample_formats[i].fmt_name))
                        return i;
        }
@@ -96,16 +91,7 @@ static void init_context(struct context *inc, const struct sample_format *fmt, G
        inc->analog.meaning = &inc->meaning;
        inc->analog.spec = &inc->spec;
 
-       inc->encoding.unitsize = fmt->unitsize;
-       inc->encoding.is_signed = fmt->is_signed;
-       inc->encoding.is_float = fmt->is_float;
-       inc->encoding.is_bigendian = fmt->is_bigendian;
-       inc->encoding.digits = 0;
-       inc->encoding.is_digits_decimal = TRUE;
-       inc->encoding.scale.p = 1;
-       inc->encoding.scale.q = 1;
-       inc->encoding.offset.p = 0;
-       inc->encoding.offset.q = 1;
+       memcpy(&inc->encoding, &fmt->encoding, sizeof(inc->encoding));
 
        inc->meaning.mq = 0;
        inc->meaning.unit = 0;
@@ -132,8 +118,7 @@ static int init(struct sr_input *in, GHashTable *options)
        format = g_variant_get_string(g_hash_table_lookup(options, "format"), NULL);
        if ((fmt_index = parse_format_string(format)) == -1) {
                GString *formats = g_string_sized_new(200);
-               int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
-               for (int i = 0; i < num_formats; i++)
+               for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++)
                        g_string_append_printf(formats, "%s ", sample_formats[i].fmt_name);
                sr_err("Invalid format '%s': must be one of: %s.",
                       format, formats->str);
@@ -150,7 +135,7 @@ static int init(struct sr_input *in, GHashTable *options)
        }
 
        inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
-       inc->samplesize = sample_formats[fmt_index].unitsize * num_channels;
+       inc->samplesize = sample_formats[fmt_index].encoding.unitsize * num_channels;
        init_context(inc, &sample_formats[fmt_index], in->sdi->channels);
 
        return SR_OK;
@@ -259,12 +244,11 @@ static struct sr_option options[] = {
 
 static const struct sr_option *get_options(void)
 {
-       int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
        if (!options[0].def) {
                options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS));
                options[1].def = g_variant_ref_sink(g_variant_new_uint64(DEFAULT_SAMPLERATE));
                options[2].def = g_variant_ref_sink(g_variant_new_string(sample_formats[0].fmt_name));
-               for (int i = 0; i < num_formats; i++) {
+               for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++) {
                        options[2].values = g_slist_append(options[2].values,
                                g_variant_ref_sink(g_variant_new_string(sample_formats[i].fmt_name)));
                }