X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fvcd.c;h=4d853057b5c712d208b642fa94838a86b1608f42;hb=7bcbbfae3e0262ed25693adb7aa1f0b864722827;hp=ffc753281a53f0f0b45c1bea8f2a53ae95da4546;hpb=563080a8d1f1737578a313b89995a9da6ec1077c;p=libsigrok.git

diff --git a/output/vcd.c b/output/vcd.c
index ffc75328..4d853057 100644
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -29,56 +29,54 @@
 #define LOG_PREFIX "output/vcd"
 
 struct context {
-	int num_enabled_probes;
-	GArray *probeindices;
+	int num_enabled_channels;
+	GArray *channelindices;
 	GString *header;
 	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 channels at %s\n$end\n";
 
 static int init(struct sr_output *o)
 {
 	struct context *ctx;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	GSList *l;
 	GVariant *gvar;
-	int num_probes, i;
+	int num_channels, i;
 	char *samplerate_s, *frequency_s, *timestamp;
 	time_t t;
 
-	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+	if (!(ctx = g_malloc0(sizeof(struct context)))) {
 		sr_err("%s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
 	o->internal = ctx;
-	ctx->num_enabled_probes = 0;
-	ctx->probeindices = g_array_new(FALSE, FALSE, sizeof(int));
+	ctx->num_enabled_channels = 0;
+	ctx->channelindices = g_array_new(FALSE, FALSE, sizeof(int));
 
-	for (l = o->sdi->probes; l; l = l->next) {
-		probe = l->data;
-		if (probe->type != SR_PROBE_LOGIC)
+	for (l = o->sdi->channels; l; l = l->next) {
+		ch = l->data;
+		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
-		if (!probe->enabled)
+		if (!ch->enabled)
 			continue;
-		ctx->probeindices = g_array_append_val(
-				ctx->probeindices, probe->index);
-		ctx->num_enabled_probes++;
+		ctx->channelindices = g_array_append_val(
+				ctx->channelindices, ch->index);
+		ctx->num_enabled_channels++;
 	}
-	if (ctx->num_enabled_probes > 94) {
-		sr_err("VCD only supports 94 probes.");
+	if (ctx->num_enabled_channels > 94) {
+		sr_err("VCD only supports 94 channels.");
 		return SR_ERR;
 	}
 
-	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 	ctx->header = g_string_sized_new(512);
-	num_probes = g_slist_length(o->sdi->probes);
+	num_channels = g_slist_length(o->sdi->channels);
 
 	/* timestamp */
 	t = time(NULL);
@@ -101,7 +99,7 @@ static int init(struct sr_output *o)
 			return SR_ERR;
 		}
 		g_string_append_printf(ctx->header, vcd_header_comment,
-				 ctx->num_enabled_probes, num_probes, samplerate_s);
+				 ctx->num_enabled_channels, num_channels, samplerate_s);
 		g_free(samplerate_s);
 	}
 
@@ -125,51 +123,37 @@ static int init(struct sr_output *o)
 	g_string_append_printf(ctx->header, "$scope module %s $end\n", PACKAGE);
 
 	/* Wires / channels */
-	for (i = 0, l = o->sdi->probes; l; l = l->next, i++) {
-		probe = l->data;
-		if (probe->type != SR_PROBE_LOGIC)
+	for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
+		ch = l->data;
+		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
-		if (!probe->enabled)
+		if (!ch->enabled)
 			continue;
 		g_string_append_printf(ctx->header, "$var wire 1 %c %s $end\n",
-				(char)('!' + i), probe->name);
+				(char)('!' + i), ch->name);
 	}
 
 	g_string_append(ctx->header, "$upscope $end\n"
-			"$enddefinitions $end\n$dumpvars\n");
-
-	if (!(ctx->prevsample = g_try_malloc0(ctx->unitsize))) {
-		g_string_free(ctx->header, TRUE);
-		g_free(ctx);
-		sr_err("%s: ctx->prevsample malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
+			"$enddefinitions $end\n");
 
 	return SR_OK;
 }
 
-static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet, GString **out)
+static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+		GString **out)
 {
 	const struct sr_datafeed_logic *logic;
 	struct context *ctx;
 	unsigned int i;
 	int p, curbit, prevbit, index;
 	uint8_t *sample;
-
-	(void)sdi;
+	gboolean timestamp_written;
 
 	*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;
@@ -179,27 +163,61 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 		*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;
+
+	if (!ctx->prevsample) {
+		/* Can't allocate this until we know the stream's unitsize. */
+		if (!(ctx->prevsample = g_malloc0(logic->unitsize))) {
+			g_free(ctx);
+			sr_err("%s: ctx->prevsample malloc failed", __func__);
+			return SR_ERR_MALLOC;
+		}
+	}
+
 	for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
 		sample = logic->data + i;
+		timestamp_written = FALSE;
+
+		for (p = 0; p < ctx->num_enabled_channels; p++) {
+			index = g_array_index(ctx->channelindices, int, p);
 
-		for (p = 0; p < ctx->num_enabled_probes; p++) {
-			index = g_array_index(ctx->probeindices, int, p);
-			curbit = ((unsigned)sample[index / 8] >> (index % 8)) & 1;
-			prevbit = ((unsigned)ctx->prevsample[index / 8] >> (index % 8)) & 1;
+			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 && 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, "#%.0f\n%i%c\n",
-				(double)ctx->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);
+		memcpy(ctx->prevsample, sample, logic->unitsize);
 	}
 
 	return SR_OK;
@@ -213,6 +231,8 @@ static int cleanup(struct sr_output *o)
 		return SR_ERR_ARG;
 
 	ctx = o->internal;
+	g_free(ctx->prevsample);
+	g_array_free(ctx->channelindices, TRUE);
 	g_free(ctx);
 
 	return SR_OK;
@@ -221,7 +241,6 @@ static int cleanup(struct sr_output *o)
 struct sr_output_format output_vcd = {
 	.id = "vcd",
 	.description = "Value Change Dump (VCD)",
-	.df_type = SR_DF_LOGIC,
 	.init = init,
 	.receive = receive,
 	.cleanup = cleanup,