Removal of sdi->index, step 3: sr_dev_inst_new() calls for input mods

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

diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c
index 9adfe61aaab62c7a279e8bbc8e2840ac26ef348f..42700dd17c22076b892a2892a8e90bd75c1f294f 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->sdi = sr_dev_inst_new(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);
@@ -99,33 +92,33 @@ static int receive(const struct sr_input *in, GString *buf)
 
        num_channels = g_slist_length(in->sdi->channels);
 
-       std_session_send_df_header(in->sdi, LOG_PREFIX);
-       inc->started = TRUE;
+       if (!inc->started) {
+               std_session_send_df_header(in->sdi, LOG_PREFIX);
+               inc->started = TRUE;
 
-       packet.type = SR_DF_META;
-       packet.payload = &meta;
-       src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
-       meta.config = g_slist_append(NULL, src);
-       sr_session_send(in->sdi, &packet);
-       sr_config_free(src);
+               packet.type = SR_DF_META;
+               packet.payload = &meta;
+               src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
+               meta.config = g_slist_append(NULL, src);
+               sr_session_send(in->sdi, &packet);
+               sr_config_free(src);
+       }
 
        packet.type = SR_DF_LOGIC;
        packet.payload = &logic;
        logic.unitsize = (num_channels + 7) / 8;
-       logic.data = in->buf->str;
 
        /* Cut off at multiple of unitsize. */
        chunk_size = in->buf->len / logic.unitsize * logic.unitsize;
 
        chunk = 0;
        for (i = 0; i < chunk_size; i += chunk) {
-               chunk = MAX(MAX_CHUNK_SIZE, chunk_size - i);
+               logic.data = in->buf->str + i;
+               chunk = MIN(MAX_CHUNK_SIZE, chunk_size - i);
                logic.length = chunk;
                sr_session_send(in->sdi, &packet);
        }
-
-       if (in->buf->len > chunk_size)
-               g_string_erase(in->buf, 0, in->buf->len - chunk_size);
+       g_string_erase(in->buf, 0, chunk_size);
 
        return SR_OK;
 }
@@ -157,7 +150,7 @@ 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;