Backport recent changes from mainline.

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

diff --git a/src/input/binary.c b/src/input/binary.c
index e3b2d243f080ee845c37d6cac77bb5db105048ed..da664a85e6f140d14de0c8796a6adc76e3034e8c 100644 (file)
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -17,29 +17,30 @@
  * 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"
 
-#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)
 {
-       struct sr_channel *ch;
        struct context *inc;
        int num_channels, i;
        char name[16];
@@ -50,21 +51,22 @@ 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);
+               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 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,22 +74,11 @@ 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);
+               std_session_send_df_header(in->sdi);
 
                if (inc->samplerate) {
                        packet.type = SR_DF_META;
@@ -95,6 +86,7 @@ static int receive(struct sr_input *in, GString *buf)
                        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);
                }
 
@@ -103,15 +95,14 @@ 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 = inc->unitsize;
 
        /* 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);
+               chunk = MIN(CHUNK_SIZE, chunk_size - i);
                logic.length = chunk;
                sr_session_send(in->sdi, &packet);
        }
@@ -120,30 +111,57 @@ 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;
+
+       if (in->sdi_ready)
+               ret = process_buffer(in);
+       else
+               ret = SR_OK;
 
        inc = in->priv;
-       if (!inc)
-               return SR_OK;
+       if (inc->started)
+               std_session_send_df_end(in->sdi);
 
-       if (inc->started) {
-               packet.type = SR_DF_END;
-               sr_session_send(in->sdi, &packet);
-       }
+       return ret;
+}
+
+static int reset(struct sr_input *in)
+{
+       struct context *inc = in->priv;
+
+       inc->started = FALSE;
+       g_string_truncate(in->buf, 0);
 
        return SR_OK;
 }
 
 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
 };
 
-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));
@@ -156,9 +174,11 @@ static 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,
        .receive = receive,
-       .cleanup = cleanup,
+       .end = end,
+       .reset = reset,
 };