Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*

[libsigrok.git] / output / ols.c

diff --git a/output/ols.c b/output/ols.c
index df6752742a38dd2d94d773c44a00d8afc58a7ee8..dc5704bbee2499a45843467b8e7cbc1a2aa0cae4 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;
@@ -46,7 +55,7 @@ static int init(struct sr_output *o)
        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,7 +69,7 @@ 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))
+       if (o->sdi->driver && sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE))
                o->sdi->driver->info_get(SR_DI_CUR_SAMPLERATE,
                                (const void **)&samplerate, o->sdi);
        else {