X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fchronovu_la8.c;h=e16f6174ec77e1bf7a40a3c8e40469391299413c;hb=580f309948b1540a32cb1fd787ae3599c68cae4b;hp=8029da1b9d2916bdcab58ec11a9296c1f3ee6662;hpb=29a27196a13de2ffd9b671185e4b464b9db9b549;p=libsigrok.git

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 8029da1b..e16f6174 100644
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/chronovu-la8: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/chronovu-la8"
 
 struct context {
 	unsigned int num_enabled_probes;
@@ -115,14 +108,16 @@ static int init(struct sr_output *o)
 	/* Get the unitsize. */
 	for (l = o->sdi->probes; l; l = l->next) {
 		probe = l->data;
+		if (probe->type != SR_PROBE_LOGIC)
+			continue;
 		if (!probe->enabled)
 			continue;
 		ctx->num_enabled_probes++;
 	}
 	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-	if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
-			o->sdi) == SR_OK) {
+	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);
 	} else