Factor out std_session_send_df_end() helper.

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

diff --git a/src/input/binary.c b/src/input/binary.c
index a8aecb60145bb2cb5d5980e1fc8b1e3b266a535e..51b9f6bfc4c2fbcff0487e257f0a9a0164ac3b60 100644 (file)
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -17,13 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/binary"
@@ -39,7 +40,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 +50,20 @@ static int init(struct sr_input *in, GHashTable *options)
                return SR_ERR_ARG;
        }
 
-       in->sdi = sr_dev_inst_new(0, 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(const 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,34 +71,32 @@ static int receive(const 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 (!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);
+               if (inc->samplerate) {
+                       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);
+                       g_slist_free(meta.config);
+                       sr_config_free(src);
+               }
+
+               inc->started = TRUE;
        }
 
        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);
@@ -111,21 +108,38 @@ static int receive(const 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)
 {
-       struct sr_datafeed_packet packet;
-       struct context *inc;
+       int ret;
 
-       inc = in->priv;
+       g_string_append_len(in->buf, buf->str, buf->len);
 
-       if (inc->started) {
-               packet.type = SR_DF_END;
-               sr_session_send(in->sdi, &packet);
+       if (!in->sdi_ready) {
+               /* sdi is ready, notify frontend. */
+               in->sdi_ready = TRUE;
+               return SR_OK;
        }
-       g_free(in->priv);
-       in->priv = NULL;
 
-       return SR_OK;
+       ret = process_buffer(in);
+
+       return ret;
+}
+
+static int end(struct sr_input *in)
+{
+       struct context *inc;
+       int ret;
+
+       if (in->sdi_ready)
+               ret = process_buffer(in);
+       else
+               ret = SR_OK;
+
+       inc = in->priv;
+       if (inc->started)
+               std_session_send_df_end(in->sdi, LOG_PREFIX);
+
+       return ret;
 }
 
 static struct sr_option options[] = {
@@ -134,7 +148,7 @@ static struct sr_option options[] = {
        ALL_ZERO
 };
 
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
 {
        if (!options[0].def) {
                options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS));
@@ -148,8 +162,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,
 };