X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fvcd.c;h=3b8aba8206b71e64a048df2b1c7b3ed1b874de95;hb=bee2b0168c087676c1b365861d8c2d4714afa9b9;hp=66f126b422ed8c0f1521b14d0dcf324813b34459;hpb=3f48fc82b5bc13e749b30a47dd6ca06f8cd2b00e;p=libsigrok.git

diff --git a/src/input/vcd.c b/src/input/vcd.c
index 66f126b4..3b8aba82 100644
--- a/src/input/vcd.c
+++ b/src/input/vcd.c
@@ -105,6 +105,10 @@ static gboolean parse_section(GString *buf, gchar **name, gchar **contents)
 	status = FALSE;
 	pos = 0;
 
+	/* Skip UTF8 BOM */
+	if (buf->len >= 3 && !strncmp(buf->str, "\xef\xbb\xbf", 3))
+		pos = 3;
+
 	/* Skip any initial white-space. */
 	while (pos < buf->len && g_ascii_isspace(buf->str[pos]))
 		pos++;
@@ -526,7 +530,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);
 
 		packet.type = SR_DF_META;
 		packet.payload = &meta;
@@ -578,7 +582,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;
 
@@ -592,10 +595,8 @@ static int end(struct sr_input *in)
 	/* Send any samples that haven't been sent yet. */
 	send_buffer(in);
 
-	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;
 }
@@ -612,6 +613,17 @@ static void cleanup(struct sr_input *in)
 	inc->current_levels = 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;
+}
+
 static struct sr_option options[] = {
 	{ "numchannels", "Number of channels", "Number of channels", NULL, NULL },
 	{ "skip", "Skip", "Skip until timestamp", NULL, NULL },
@@ -644,4 +656,5 @@ SR_PRIV struct sr_input_module input_vcd = {
 	.receive = receive,
 	.end = end,
 	.cleanup = cleanup,
+	.reset = reset,
 };