X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Fbinary.c;h=736e4cf24e043133161be90c9bf4735716d06f98;hb=36e3f6a9cecffe72cfb85f85ed3ea7a43f586fec;hp=813cf4a46e8be054d8ee0f42fc8dc0aca360191c;hpb=577a9fe4235d5b090aaec562ea8013c79712da7e;p=libsigrok.git
diff --git a/src/input/binary.c b/src/input/binary.c
index 813cf4a4..736e4cf2 100644
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -17,13 +17,14 @@
* 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"
@@ -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,15 +50,14 @@ 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);
+ sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name);
}
return SR_OK;
@@ -165,6 +164,7 @@ SR_PRIV struct sr_input_module input_binary = {
.id = "binary",
.name = "Binary",
.desc = "Raw binary",
+ .exts = NULL,
.options = get_options,
.init = init,
.receive = receive,