X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fvcd.c;h=561b3ba059fc914583b85c0b01901a5490f62e7f;hb=2868bca35b321ad922326a213146c648ffa3410e;hp=fd7b9123cefda54b98fa32e0bce26fa6fabba194;hpb=b9eb8e1a8cdb4ac6449cfa881da96bcf9bc687ad;p=libsigrok.git

diff --git a/src/output/vcd.c b/src/output/vcd.c
index fd7b9123..561b3ba0 100644
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -15,10 +15,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
@@ -29,7 +29,6 @@
 
 struct context {
 	int num_enabled_channels;
-	GArray *channelindices;
 	uint8_t *prevsample;
 	gboolean header_done;
 	int period;
@@ -97,13 +96,13 @@ static GString *gen_header(const struct sr_output *o)
 	/* timestamp */
 	t = time(NULL);
 	timestamp = g_strdup(ctime(&t));
-	timestamp[strlen(timestamp)-1] = 0;
+	timestamp[strlen(timestamp) - 1] = 0;
 	g_string_printf(header, "$date %s $end\n", timestamp);
 	g_free(timestamp);
 
 	/* generator */
 	g_string_append_printf(header, "$version %s %s $end\n",
-			PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
+			PACKAGE_NAME, sr_package_version_string_get());
 	g_string_append_printf(header, "$comment\n  Acquisition with "
 			"%d/%d channels", ctx->num_enabled_channels, num_channels);
 
@@ -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;
@@ -261,7 +270,7 @@ static int cleanup(struct sr_output *o)
 struct sr_output_module output_vcd = {
 	.id = "vcd",
 	.name = "VCD",
-	.desc = "Value Change Dump",
+	.desc = "Value Change Dump data",
 	.exts = (const char*[]){"vcd", NULL},
 	.flags = 0,
 	.options = NULL,