X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fvcd.c;h=44a12dec37a8c2e2265ea499d4410d61443d5ac3;hb=bc059b42a26bbfa1d64bbf617abe4d440bdc57c5;hp=0ede5fe7a42318bee28d83e481347107aff9fbab;hpb=d601c0e9b37be9174c8a4447aa05aeb7be82be73;p=libsigrok.git

diff --git a/output/vcd.c b/output/vcd.c
index 0ede5fe7..44a12dec 100644
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -26,18 +26,11 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/vcd: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "output/vcd"
 
 struct context {
 	int num_enabled_probes;
-	int probeindices[SR_MAX_NUM_PROBES + 1];
+	GArray *probeindices;
 	GString *header;
 	uint8_t *prevsample;
 	int period;
@@ -65,12 +58,16 @@ static int init(struct sr_output *o)
 
 	o->internal = ctx;
 	ctx->num_enabled_probes = 0;
+	ctx->probeindices = 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)
+			continue;
 		if (!probe->enabled)
 			continue;
-		ctx->probeindices[ctx->num_enabled_probes] = probe->index;
+		ctx->probeindices = g_array_append_val(
+				ctx->probeindices, probe->index);
 		ctx->num_enabled_probes++;
 	}
 	if (ctx->num_enabled_probes > 94) {
@@ -93,19 +90,18 @@ static int init(struct sr_output *o)
 	g_string_append_printf(ctx->header, "$version %s %s $end\n",
 			PACKAGE, PACKAGE_VERSION);
 
-	if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
-		o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+	if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+			&gvar) == SR_OK) {
 		ctx->samplerate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
 		if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
 			g_string_free(ctx->header, TRUE);
 			g_free(ctx);
-			g_variant_unref(gvar);
 			return SR_ERR;
 		}
 		g_string_append_printf(ctx->header, vcd_header_comment,
 				 ctx->num_enabled_probes, num_probes, samplerate_s);
 		g_free(samplerate_s);
-		g_variant_unref(gvar);
 	}
 
 	/* timescale */
@@ -130,6 +126,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",
@@ -149,12 +147,11 @@ static int init(struct sr_output *o)
 	return SR_OK;
 }
 
-static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet)
+static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
+		const struct sr_datafeed_packet *packet, GString **out)
 {
 	const struct sr_datafeed_logic *logic;
 	struct context *ctx;
-	GString *text;
 	unsigned int i;
 	int p, curbit, prevbit, index;
 	uint8_t *sample;
@@ -162,23 +159,23 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 
 	(void)sdi;
 
+	*out = NULL;
 	if (!o || !o->internal)
-		return NULL;
+		return SR_ERR_ARG;
 	ctx = o->internal;
 
 	if (packet->type == SR_DF_END) {
-		text = g_string_sized_new(16);
-		g_string_printf(text, "$dumpoff\n$end\n");
-		return text;
+		*out = g_string_new("$dumpoff\n$end\n");
+		return SR_OK;
 	} else if (packet->type != SR_DF_LOGIC)
-		return NULL;
+		return SR_OK;
 
 	if (ctx->header) {
 		/* The header is still here, this must be the first packet. */
-		text = ctx->header;
+		*out = ctx->header;
 		ctx->header = NULL;
 	} else {
-		text = g_string_sized_new(512);
+		*out = g_string_sized_new(512);
 	}
 
 	logic = packet->payload;
@@ -188,16 +185,16 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 		sample = logic->data + i;
 
 		for (p = 0; p < ctx->num_enabled_probes; p++) {
-			index = ctx->probeindices[p % 8];
+			index = g_array_index(ctx->probeindices, int, p);
 			curbit = (sample[p / 8] & (((uint8_t) 1) << index)) >> index;
-			prevbit = (ctx->prevsample[p / 8] & (((uint64_t) 1) << index)) >> index;
+			prevbit = (ctx->prevsample[p / 8] & (((uint8_t) 1) << index)) >> index;
 
 			/* VCD only contains deltas/changes of signals. */
 			if (prevbit == curbit)
 				continue;
 
 			/* Output which signal changed to which value. */
-			g_string_append_printf(text, "#%" PRIu64 "\n%i%c\n",
+			g_string_append_printf(*out, "#%" PRIu64 "\n%i%c\n",
 					(uint64_t)(((float)samplecount / ctx->samplerate)
 					* ctx->period), curbit, (char)('!' + p));
 		}
@@ -205,7 +202,7 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 		memcpy(ctx->prevsample, sample, ctx->unitsize);
 	}
 
-	return text;
+	return SR_OK;
 }
 
 static int cleanup(struct sr_output *o)
@@ -226,6 +223,6 @@ struct sr_output_format output_vcd = {
 	.description = "Value Change Dump (VCD)",
 	.df_type = SR_DF_LOGIC,
 	.init = init,
-	.recv = receive,
+	.receive = receive,
 	.cleanup = cleanup,
 };