X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fbinary.c;h=91e4d3c434e45cdcfa65b3597e2f16c8476af9cc;hb=1aba65727015e298f213c851dbc8d2d57d27d37b;hp=5d5fc865b2fe1a51228e61d09a87c2d5f0976c30;hpb=aac29cc192ccf82b64e77b5e6b11b411da32deed;p=libsigrok.git
diff --git a/src/input/binary.c b/src/input/binary.c
index 5d5fc865..91e4d3c4 100644
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -17,20 +17,21 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#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;
@@ -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];
@@ -57,8 +57,7 @@ static int init(struct sr_input *in, GHashTable *options)
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;
@@ -76,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;
@@ -84,6 +83,7 @@ static int process_buffer(struct sr_input *in)
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);
}
@@ -128,7 +128,6 @@ static int receive(struct sr_input *in, GString *buf)
static int end(struct sr_input *in)
{
struct context *inc;
- struct sr_datafeed_packet packet;
int ret;
if (in->sdi_ready)
@@ -137,21 +136,29 @@ static int end(struct sr_input *in)
ret = SR_OK;
inc = in->priv;
- if (inc->started) {
- packet.type = SR_DF_END;
- sr_session_send(in->sdi, &packet);
- }
+ if (inc->started)
+ 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 },
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));
@@ -165,8 +172,10 @@ SR_PRIV struct sr_input_module input_binary = {
.id = "binary",
.name = "Binary",
.desc = "Raw binary",
+ .exts = NULL,
.options = get_options,
.init = init,
.receive = receive,
.end = end,
+ .reset = reset,
};