X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fvcd.c;h=79145c1ae0b4f8d9e41dc3d58dea47b04b5f0168;hb=d8cbd659ce2e24428c7e403eeebd50ad4a992caa;hp=60ec58c3a9bd67f65623c446c67f40743a138b89;hpb=34539700795f6ef4879105818cf8ed4e7336d6c1;p=libsigrok.git

diff --git a/output/vcd.c b/output/vcd.c
index 60ec58c3..79145c1a 100644
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -26,14 +26,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/vcd: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/vcd"
 
 struct context {
 	int num_enabled_probes;
@@ -42,11 +35,12 @@ struct context {
 	uint8_t *prevsample;
 	int period;
 	uint64_t samplerate;
+	uint64_t samplecount;
 	unsigned int unitsize;
 };
 
-static const char *vcd_header_comment = "\
-$comment\n  Acquisition with %d/%d probes at %s\n$end\n";
+static const char *const vcd_header_comment =
+	"$comment\n  Acquisition with %d/%d probes at %s\n$end\n";
 
 static int init(struct sr_output *o)
 {
@@ -69,6 +63,8 @@ static int init(struct sr_output *o)
 
 	for (l = o->sdi->probes; l; l = l->next) {
 		probe = l->data;
+		if (probe->type != SR_PROBE_LOGIC)
+			continue;
 		if (!probe->enabled)
 			continue;
 		ctx->probeindices = g_array_append_val(
@@ -131,6 +127,8 @@ static int init(struct sr_output *o)
 	/* Wires / channels */
 	for (i = 0, l = o->sdi->probes; l; l = l->next, i++) {
 		probe = l->data;
+		if (probe->type != SR_PROBE_LOGIC)
+			continue;
 		if (!probe->enabled)
 			continue;
 		g_string_append_printf(ctx->header, "$var wire 1 %c %s $end\n",
@@ -138,7 +136,7 @@ static int init(struct sr_output *o)
 	}
 
 	g_string_append(ctx->header, "$upscope $end\n"
-			"$enddefinitions $end\n$dumpvars\n");
+			"$enddefinitions $end\n");
 
 	if (!(ctx->prevsample = g_try_malloc0(ctx->unitsize))) {
 		g_string_free(ctx->header, TRUE);
@@ -158,50 +156,68 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 	unsigned int i;
 	int p, curbit, prevbit, index;
 	uint8_t *sample;
-	static uint64_t samplecount = 0;
+	gboolean timestamp_written;
 
 	(void)sdi;
 
 	*out = NULL;
 	if (!o || !o->internal)
-		return SR_ERR_ARG;
+		return SR_ERR_BUG;
 	ctx = o->internal;
 
-	if (packet->type == SR_DF_END) {
-		*out = g_string_new("$dumpoff\n$end\n");
-		return SR_OK;
-	} else if (packet->type != SR_DF_LOGIC)
-		return SR_OK;
-
 	if (ctx->header) {
 		/* The header is still here, this must be the first packet. */
 		*out = ctx->header;
 		ctx->header = NULL;
+		ctx->samplecount = 0;
 	} else {
 		*out = g_string_sized_new(512);
 	}
 
+	if (packet->type != SR_DF_LOGIC) {
+		if (packet->type == SR_DF_END)
+			/* Write final timestamp as length indicator. */
+			g_string_append_printf(*out, "#%.0f\n",
+				(double)ctx->samplecount /
+					ctx->samplerate * ctx->period);
+		return SR_OK;
+	}
+
 	logic = packet->payload;
 	for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
-		samplecount++;
-
 		sample = logic->data + i;
+		timestamp_written = FALSE;
 
 		for (p = 0; p < ctx->num_enabled_probes; p++) {
 			index = g_array_index(ctx->probeindices, int, p);
-			curbit = (sample[p / 8] & (((uint8_t) 1) << index)) >> index;
-			prevbit = (ctx->prevsample[p / 8] & (((uint8_t) 1) << index)) >> index;
+
+			curbit = ((unsigned)sample[index / 8]
+					>> (index % 8)) & 1;
+			prevbit = ((unsigned)ctx->prevsample[index / 8]
+					>> (index % 8)) & 1;
 
 			/* VCD only contains deltas/changes of signals. */
-			if (prevbit == curbit)
+			if (prevbit == curbit && ctx->samplecount > 0)
 				continue;
 
+			/* Output timestamp of subsequent signal changes. */
+			if (!timestamp_written)
+				g_string_append_printf(*out, "#%.0f",
+					(double)ctx->samplecount /
+						ctx->samplerate * ctx->period);
+
 			/* Output which signal changed to which value. */
-			g_string_append_printf(*out, "#%" PRIu64 "\n%i%c\n",
-					(uint64_t)(((float)samplecount / ctx->samplerate)
-					* ctx->period), curbit, (char)('!' + p));
+			g_string_append_c(*out, ' ');
+			g_string_append_c(*out, '0' + curbit);
+			g_string_append_c(*out, '!' + p);
+
+			timestamp_written = TRUE;
 		}
 
+		if (timestamp_written)
+			g_string_append_c(*out, '\n');
+
+		ctx->samplecount++;
 		memcpy(ctx->prevsample, sample, ctx->unitsize);
 	}