rigol-ds: replace some magic numbers by appropriate constant or variable

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

diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c
index 7c957febbb5673eacd7dfd68d627106e78961748..058d8dd5b5d89d3ac4c43392804f09b3ff476d77 100644 (file)
--- a/src/input/chronovu_la8.c
+++ b/src/input/chronovu_la8.c
@@ -28,7 +28,7 @@
 #define LOG_PREFIX "input/chronovu-la8"
 
 #define DEFAULT_NUM_CHANNELS    8
-#define DEFAULT_SAMPLERATE      "100MHz"
+#define DEFAULT_SAMPLERATE      100000000L
 #define MAX_CHUNK_SIZE          4096
 #define CHRONOVU_LA8_FILESIZE   8 * 1024 * 1024 + 5
 
@@ -44,18 +44,16 @@ static int format_match(GHashTable *metadata)
        size = GPOINTER_TO_INT(g_hash_table_lookup(metadata,
                        GINT_TO_POINTER(SR_INPUT_META_FILESIZE)));
        if (size == CHRONOVU_LA8_FILESIZE)
-               return TRUE;
+               return SR_OK;
 
-       return FALSE;
+       return SR_ERR;
 }
 
 static int init(struct sr_input *in, GHashTable *options)
 {
        struct sr_channel *ch;
        struct context *inc;
-       uint64_t samplerate;
        int num_channels, i;
-       const char *s;
        char name[16];
 
        num_channels = g_variant_get_int32(g_hash_table_lookup(options, "numchannels"));
@@ -64,15 +62,10 @@ static int init(struct sr_input *in, GHashTable *options)
                return SR_ERR_ARG;
        }
 
-       s = g_variant_get_string(g_hash_table_lookup(options, "samplerate"), NULL);
-       if (sr_parse_sizestring(s, &samplerate) != SR_OK) {
-               sr_err("Invalid samplerate '%s'.", s);
-               return SR_ERR_ARG;
-       }
-
        in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
        in->priv = inc = g_malloc0(sizeof(struct context));
-       inc->samplerate = samplerate;
+
+       inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
 
        for (i = 0; i < num_channels; i++) {
                snprintf(name, 16, "%d", i);
@@ -150,14 +143,14 @@ static int cleanup(struct sr_input *in)
 static struct sr_option options[] = {
        { "numchannels", "Number of channels", "Number of channels", NULL, NULL },
        { "samplerate", "Sample rate", "Sample rate", NULL, NULL },
-       { 0 }
+       ALL_ZERO
 };
 
 static struct sr_option *get_options(void)
 {
        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_string(DEFAULT_SAMPLERATE));
+               options[1].def = g_variant_ref_sink(g_variant_new_uint64(DEFAULT_SAMPLERATE));
        }
 
        return options;