korad-kaxxxxp: Simplify korad_kaxxxxp_receive_data() event loop function.

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

diff --git a/src/input/binary.c b/src/input/binary.c
index 51b9f6bfc4c2fbcff0487e257f0a9a0164ac3b60..013621373c71dd4eed995c19980fed76c1b13cbc 100644 (file)
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -29,9 +29,9 @@
 
 #define LOG_PREFIX "input/binary"
 
-#define MAX_CHUNK_SIZE        4096
-#define DEFAULT_NUM_CHANNELS  8
-#define DEFAULT_SAMPLERATE    0
+#define MAX_CHUNK_SIZE       4096
+#define DEFAULT_NUM_CHANNELS 8
+#define DEFAULT_SAMPLERATE   0
 
 struct context {
        gboolean started;
@@ -56,7 +56,7 @@ 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);
        }
 
@@ -75,7 +75,7 @@ static int process_buffer(struct sr_input *in)
 
        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;
@@ -137,11 +137,21 @@ 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;
 }
 
+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 },
@@ -167,4 +177,5 @@ SR_PRIV struct sr_input_module input_binary = {
        .init = init,
        .receive = receive,
        .end = end,
+       .reset = reset,
 };