X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fvcd.c;h=d0b14a04d26f1ba661d57949a52fcbb0a9aba3b3;hb=641107aa6c5864bd5d66f3f6dafa7c2493d55de5;hp=ba06c5ae69d885bdc43effe63f9708dd147da33f;hpb=2ea1fdf12113311cbe1a4316e9e2efe4d8ac40f0;p=libsigrok.git

diff --git a/src/output/vcd.c b/src/output/vcd.c
index ba06c5ae..d0b14a04 100644
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -29,7 +29,6 @@
 
 struct context {
 	int num_enabled_channels;
-	GArray *channelindices;
 	uint8_t *prevsample;
 	gboolean header_done;
 	int period;
@@ -129,7 +128,7 @@ static GString *gen_header(const struct sr_output *o)
 		ctx->period = SR_MHZ(1);
 	else
 		ctx->period = SR_KHZ(1);
-	frequency_s = sr_period_string(ctx->period);
+	frequency_s = sr_period_string(1, ctx->period);
 	g_string_append_printf(header, "$timescale %s $end\n", frequency_s);
 	g_free(frequency_s);
 
@@ -137,7 +136,7 @@ static GString *gen_header(const struct sr_output *o)
 	g_string_append_printf(header, "$scope module %s $end\n", PACKAGE_NAME);
 
 	/* Wires / channels */
-	for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
+	for (i = 0, l = o->sdi->channels; l; l = l->next) {
 		ch = l->data;
 		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
@@ -145,6 +144,7 @@ static GString *gen_header(const struct sr_output *o)
 			continue;
 		g_string_append_printf(header, "$var wire 1 %c %s $end\n",
 				(char)('!' + i), ch->name);
+		i++;
 	}
 
 	g_string_append(header, "$upscope $end\n$enddefinitions $end\n");
@@ -200,7 +200,16 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 			timestamp_written = FALSE;
 
 			for (p = 0; p < ctx->num_enabled_channels; p++) {
-				index = ctx->channel_index[p];
+				/*
+				 * TODO Check whether the mapping from
+				 * data image positions to channel numbers
+				 * is required. Experiments suggest that
+				 * the data image "is dense", and packs
+				 * bits of enabled channels, and leaves no
+				 * room for positions of disabled channels.
+				 */
+				/* index = ctx->channel_index[p]; */
+				index = p;
 
 				curbit = ((unsigned)sample[index / 8]
 						>> (index % 8)) & 1;