output/csv: use intermediate time_t var, silence compiler warning

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

diff --git a/src/input/binary.c b/src/input/binary.c
index e693f581f78872b99502d3e3374039b38d6587a5..631d6d38c10d85d8fa620d354da60305873e9392 100644 (file)
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -29,13 +29,14 @@
 
 #define LOG_PREFIX "input/binary"
 
-#define MAX_CHUNK_SIZE        4096
-#define DEFAULT_NUM_CHANNELS  8
-#define DEFAULT_SAMPLERATE    0
+#define CHUNK_SIZE           (4 * 1024 * 1024)
+#define DEFAULT_NUM_CHANNELS 8
+#define DEFAULT_SAMPLERATE   0
 
 struct context {
        gboolean started;
        uint64_t samplerate;
+       uint16_t unitsize;
 };
 
 static int init(struct sr_input *in, GHashTable *options)
@@ -56,35 +57,30 @@ static int init(struct sr_input *in, GHashTable *options)
        inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
 
        for (i = 0; i < num_channels; i++) {
-               snprintf(name, 16, "%d", i);
+               snprintf(name, sizeof(name), "%d", i);
                sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name);
        }
 
+       inc->unitsize = (g_slist_length(in->sdi->channels) + 7) / 8;
+
        return SR_OK;
 }
 
 static int process_buffer(struct sr_input *in)
 {
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_meta meta;
        struct sr_datafeed_logic logic;
-       struct sr_config *src;
        struct context *inc;
        gsize chunk_size, i;
        int chunk;
 
        inc = in->priv;
        if (!inc->started) {
-               std_session_send_df_header(in->sdi, LOG_PREFIX);
+               std_session_send_df_header(in->sdi);
 
                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);
+                       (void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE,
+                               g_variant_new_uint64(inc->samplerate));
                }
 
                inc->started = TRUE;
@@ -92,14 +88,16 @@ static int process_buffer(struct sr_input *in)
 
        packet.type = SR_DF_LOGIC;
        packet.payload = &logic;
-       logic.unitsize = (g_slist_length(in->sdi->channels) + 7) / 8;
+       logic.unitsize = inc->unitsize;
 
        /* Cut off at multiple of unitsize. */
        chunk_size = in->buf->len / logic.unitsize * logic.unitsize;
 
        for (i = 0; i < chunk_size; i += chunk) {
                logic.data = in->buf->str + i;
-               chunk = MIN(MAX_CHUNK_SIZE, chunk_size - i);
+               chunk = MIN(CHUNK_SIZE, chunk_size - i);
+               chunk /= logic.unitsize;
+               chunk *= logic.unitsize;
                logic.length = chunk;
                sr_session_send(in->sdi, &packet);
        }
@@ -137,7 +135,7 @@ static int end(struct sr_input *in)
 
        inc = in->priv;
        if (inc->started)
-               std_session_send_df_end(in->sdi, LOG_PREFIX);
+               std_session_send_df_end(in->sdi);
 
        return ret;
 }
@@ -153,8 +151,8 @@ static int reset(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 },
+       { "numchannels", "Number of logic channels", "The number of (logic) channels in the data", NULL, NULL },
+       { "samplerate", "Sample rate (Hz)", "The sample rate of the (logic) data in Hz", NULL, NULL },
        ALL_ZERO
 };
 
@@ -171,7 +169,7 @@ static const struct sr_option *get_options(void)
 SR_PRIV struct sr_input_module input_binary = {
        .id = "binary",
        .name = "Binary",
-       .desc = "Raw binary",
+       .desc = "Raw binary logic data",
        .exts = NULL,
        .options = get_options,
        .init = init,