Improve readability and clarity of some numbers.

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

diff --git a/src/input/binary.c b/src/input/binary.c
index 15dc0da191702b75291377d4ae05bcd621f1f83e..d7080b0b22bf6c83df05abd26d471c272024c99b 100644 (file)
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -39,7 +39,6 @@ struct context {
 
 static int init(struct sr_input *in, GHashTable *options)
 {
-       struct sr_channel *ch;
        struct context *inc;
        int num_channels, i;
        char name[16];
@@ -50,21 +49,20 @@ static int init(struct sr_input *in, GHashTable *options)
                return SR_ERR_ARG;
        }
 
-       in->sdi = sr_dev_inst_new(SR_ST_ACTIVE, NULL, NULL, NULL);
+       in->sdi = g_malloc0(sizeof(struct sr_dev_inst));
        in->priv = inc = g_malloc0(sizeof(struct context));
 
        inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
 
        for (i = 0; i < num_channels; i++) {
                snprintf(name, 16, "%d", i);
-               ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, name);
-               in->sdi->channels = g_slist_append(in->sdi->channels, ch);
+               sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name);
        }
 
        return SR_OK;
 }
 
-static int receive(struct sr_input *in, GString *buf)
+static int process_buffer(struct sr_input *in)
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_meta meta;
@@ -72,20 +70,9 @@ static int receive(struct sr_input *in, GString *buf)
        struct sr_config *src;
        struct context *inc;
        gsize chunk_size, i;
-       int chunk, num_channels;
+       int chunk;
 
        inc = in->priv;
-
-       g_string_append_len(in->buf, buf->str, buf->len);
-
-       num_channels = g_slist_length(in->sdi->channels);
-
-       if (!in->sdi_ready) {
-               /* sdi is ready, notify frontend. */
-               in->sdi_ready = TRUE;
-               return SR_OK;
-       }
-
        if (!inc->started) {
                std_session_send_df_header(in->sdi, LOG_PREFIX);
 
@@ -103,12 +90,11 @@ static int receive(struct sr_input *in, GString *buf)
 
        packet.type = SR_DF_LOGIC;
        packet.payload = &logic;
-       logic.unitsize = (num_channels + 7) / 8;
+       logic.unitsize = (g_slist_length(in->sdi->channels) + 7) / 8;
 
        /* 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) {
                logic.data = in->buf->str + i;
                chunk = MIN(MAX_CHUNK_SIZE, chunk_size - i);
@@ -120,23 +106,41 @@ static int receive(struct sr_input *in, GString *buf)
        return SR_OK;
 }
 
-static int cleanup(struct sr_input *in)
+static int receive(struct sr_input *in, GString *buf)
+{
+       int ret;
+
+       g_string_append_len(in->buf, buf->str, buf->len);
+
+       if (!in->sdi_ready) {
+               /* sdi is ready, notify frontend. */
+               in->sdi_ready = TRUE;
+               return SR_OK;
+       }
+
+       ret = process_buffer(in);
+
+       return ret;
+}
+
+static int end(struct sr_input *in)
 {
        struct context *inc;
        struct sr_datafeed_packet packet;
+       int ret;
 
-       inc = in->priv;
-       if (!inc)
-               return SR_OK;
+       if (in->sdi_ready)
+               ret = process_buffer(in);
+       else
+               ret = SR_OK;
 
+       inc = in->priv;
        if (inc->started) {
                packet.type = SR_DF_END;
                sr_session_send(in->sdi, &packet);
        }
-       g_free(in->priv);
-       in->priv = NULL;
 
-       return SR_OK;
+       return ret;
 }
 
 static struct sr_option options[] = {
@@ -159,8 +163,9 @@ SR_PRIV struct sr_input_module input_binary = {
        .id = "binary",
        .name = "Binary",
        .desc = "Raw binary",
+       .exts = NULL,
        .options = get_options,
        .init = init,
        .receive = receive,
-       .cleanup = cleanup,
+       .end = end,
 };