drivers: rename and reorganize config get/set

[libsigrok.git] / output / ols.c

diff --git a/output/ols.c b/output/ols.c
index 6ba384a9bcd679dbaee67a9c67831df73ef08c0b..f5eaad45099cd3ab4a6c203c12371b89a0c723f5 100644 (file)
--- a/output/ols.c
+++ b/output/ols.c
@@ -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,32 +51,34 @@ static int init(struct sr_output *o)
        struct context *ctx;
        struct sr_probe *probe;
        GSList *l;
-       uint64_t samplerate;
+       uint64_t *samplerate, tmp;
        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;
 
        ctx->num_samples = 0;
        num_enabled_probes = 0;
-       for (l = o->dev->probes; l; l = l->next) {
+       for (l = o->sdi->probes; l; l = l->next) {
                probe = l->data;
                if (probe->enabled)
                        num_enabled_probes++;
        }
        ctx->unitsize = (num_enabled_probes + 7) / 8;
 
-       if (o->dev->driver && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE))
-               samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
-                               o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
-       else
-               samplerate = 0;
+       if (o->sdi->driver && sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE))
+               o->sdi->driver->config_get(SR_DI_CUR_SAMPLERATE,
+                               (const void **)&samplerate, o->sdi);
+       else {
+               tmp = 0;
+               samplerate = &tmp;
+       }
 
        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");