X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fbinary.c;h=51b9f6bfc4c2fbcff0487e257f0a9a0164ac3b60;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=b3f12d760b899692e4ef0b6424969b618bfabbd3;hpb=0af636bed97c174bea46e61e961eaa1b0b162e0f;p=libsigrok.git

diff --git a/src/input/binary.c b/src/input/binary.c
index b3f12d76..51b9f6bf 100644
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -17,13 +17,14 @@
  * 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"
@@ -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();
+	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;
@@ -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,10 +136,8 @@ 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, LOG_PREFIX);
 
 	return ret;
 }
@@ -151,7 +148,7 @@ static struct sr_option options[] = {
 	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,6 +162,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,