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

diff --git a/output/vcd.c b/output/vcd.c
index 6e13d704..44a12dec 100644
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -26,14 +26,7 @@
 #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;
@@ -69,6 +62,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(
@@ -95,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 */
@@ -132,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",
@@ -191,7 +187,7 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 		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] & (((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)