X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Fols.c;h=c3b5799c7d9709a50f951ecd42462089f2abbc72;hb=d00088ca6daf91270f8c2f063167eedf2644bb8f;hp=df6752742a38dd2d94d773c44a00d8afc58a7ee8;hpb=5c3c1241d2e2b5d456865e876490492d76174257;p=libsigrok.git

diff --git a/output/ols.c b/output/ols.c
index df675274..c3b5799c 100644
--- a/output/ols.c
+++ b/output/ols.c
@@ -2,7 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,15 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "output/ols: "
+#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)
+
 struct context {
 	GString *header;
 	uint64_t num_samples;
@@ -42,11 +51,12 @@ static int init(struct sr_output *o)
 	struct context *ctx;
 	struct sr_probe *probe;
 	GSList *l;
-	uint64_t *samplerate, tmp;
+	GVariant *gvar;
+	uint64_t samplerate;
 	int num_enabled_probes;
 
 	if (!(ctx = g_try_malloc(sizeof(struct context)))) {
-		sr_err("ols out: %s: ctx malloc failed", __func__);
+		sr_err("%s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 	o->internal = ctx;
@@ -60,16 +70,16 @@ static int init(struct sr_output *o)
 	}
 	ctx->unitsize = (num_enabled_probes + 7) / 8;
 
-	if (o->sdi->driver && sr_dev_has_hwcap(o->sdi, SR_HWCAP_SAMPLERATE))
-		o->sdi->driver->info_get(SR_DI_CUR_SAMPLERATE,
-				(const void **)&samplerate, o->sdi);
-	else {
-		tmp = 0;
-		samplerate = &tmp;
+	if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
+		o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+		samplerate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
+	} else {
+		samplerate = 0;
 	}
 
 	ctx->header = g_string_sized_new(512);
-	g_string_append_printf(ctx->header, ";Rate: %"PRIu64"\n", *samplerate);
+	g_string_append_printf(ctx->header, ";Rate: %"PRIu64"\n", samplerate);
 	g_string_append_printf(ctx->header, ";Channels: %d\n", num_enabled_probes);
 	g_string_append_printf(ctx->header, ";EnabledChannels: -1\n");
 	g_string_append_printf(ctx->header, ";Compressed: true\n");