X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fraw_analog.c;h=5241e74ca5261c005861ac3eca15f2d198523710;hb=4d399734b4ec7affb58c5881ea1b8d88eaa57d53;hp=a72cbd024b2c6b1cc141eb0b1c57e7cb690ee71f;hpb=30726a8a3222e8effcc63c7a25db1546b6d558fd;p=libsigrok.git

diff --git a/src/input/raw_analog.c b/src/input/raw_analog.c
index a72cbd02..5241e74c 100644
--- a/src/input/raw_analog.c
+++ b/src/input/raw_analog.c
@@ -48,11 +48,11 @@ struct context {
 };
 
 struct sample_format {
-	const char const *fmt_name;
+	const char *fmt_name;
 	struct sr_analog_encoding encoding;
 };
 
-static const struct sample_format const sample_formats[] =
+static const struct sample_format sample_formats[] =
 {
 	{ "S8",         { 1, TRUE,  FALSE, FALSE, 0, TRUE, { 1,                     128}, { 0, 1}}},
 	{ "U8",         { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1,                     255}, {-1, 2}}},
@@ -217,7 +217,6 @@ static int receive(struct sr_input *in, GString *buf)
 
 static int end(struct sr_input *in)
 {
-	struct sr_datafeed_packet packet;
 	struct context *inc;
 	int ret;
 
@@ -227,10 +226,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;
 }
@@ -270,6 +267,17 @@ static void cleanup(struct sr_input *in)
 	in->priv = NULL;
 }
 
+static int reset(struct sr_input *in)
+{
+	struct context *inc = in->priv;
+
+	cleanup(in);
+	inc->started = FALSE;
+	g_string_truncate(in->buf, 0);
+
+	return SR_OK;
+}
+
 SR_PRIV struct sr_input_module input_raw_analog = {
 	.id = "raw_analog",
 	.name = "RAW analog",
@@ -280,4 +288,5 @@ SR_PRIV struct sr_input_module input_raw_analog = {
 	.receive = receive,
 	.end = end,
 	.cleanup = cleanup,
+	.reset = reset,
 };