X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fbinary.c;h=e693f581f78872b99502d3e3374039b38d6587a5;hb=f4b4725bce213c58dd370a6c84ba4b327a89f7a4;hp=23b9574f8de9400bca91ff39755ecd015020c64b;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git

diff --git a/src/input/binary.c b/src/input/binary.c
index 23b9574f..e693f581 100644
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -17,6 +17,7 @@
  * 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>
@@ -82,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);
 		}
 
@@ -126,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)
@@ -135,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, LOG_PREFIX);
 
 	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));
@@ -168,4 +177,5 @@ SR_PRIV struct sr_input_module input_binary = {
 	.init = init,
 	.receive = receive,
 	.end = end,
+	.reset = reset,
 };