input: Add sr_input_end().

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

diff --git a/src/input/binary.c b/src/input/binary.c
index e3b2d243f080ee845c37d6cac77bb5db105048ed..5862e36e24799d473357dde7f02670d029e1b4cb 100644 (file)
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -64,7 +64,7 @@ static int init(struct sr_input *in, GHashTable *options)
        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 +72,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,7 +92,7 @@ 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;
@@ -120,21 +109,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);
        }
 
-       return SR_OK;
+       return ret;
 }
 
 static struct sr_option options[] = {
@@ -160,5 +169,5 @@ SR_PRIV struct sr_input_module input_binary = {
        .options = get_options,
        .init = init,
        .receive = receive,
-       .cleanup = cleanup,
+       .end = end,
 };