X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fols.c;h=9f9cc957bdb743566e01a96570b46bafb8f6b8d2;hb=311622f69e35a1c82d76ece9995daf14d94c191f;hp=67de327c0788311a55bd065ebe517256d19570f9;hpb=29a27196a13de2ffd9b671185e4b464b9db9b549;p=libsigrok.git

diff --git a/output/ols.c b/output/ols.c
index 67de327c..9f9cc957 100644
--- a/output/ols.c
+++ b/output/ols.c
@@ -31,14 +31,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/ols: "
-#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/ols"
 
 struct context {
 	uint64_t samplerate;
@@ -69,8 +62,8 @@ static GString *gen_header(const struct sr_dev_inst *sdi, struct context *ctx)
 	GVariant *gvar;
 	int num_enabled_probes;
 
-	if (!ctx->samplerate && sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-			&gvar, sdi) == SR_OK) {
+	if (!ctx->samplerate && sr_config_get(sdi->driver, sdi, NULL,
+			SR_CONF_SAMPLERATE, &gvar) == SR_OK) {
 		ctx->samplerate = g_variant_get_uint64(gvar);
 		g_variant_unref(gvar);
 	}
@@ -78,8 +71,11 @@ static GString *gen_header(const struct sr_dev_inst *sdi, struct context *ctx)
 	num_enabled_probes = 0;
 	for (l = sdi->probes; l; l = l->next) {
 		probe = l->data;
-		if (probe->enabled)
-			num_enabled_probes++;
+		if (probe->type != SR_PROBE_LOGIC)
+			continue;
+		if (!probe->enabled)
+			continue;
+		num_enabled_probes++;
 	}
 
 	s = g_string_sized_new(512);