output: Use sr_config_get() wrapper

[libsigrok.git] / output / chronovu_la8.c

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index f5da904a230f18a6819542f2419fc1391c7b8338..a6184da2f00fd14087845fdb3a9128cf1bf60865 100644 (file)
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -36,7 +36,6 @@
 struct context {
        unsigned int num_enabled_probes;
        unsigned int unitsize;
-       char *probelist[SR_MAX_NUM_PROBES + 1];
        uint64_t trigger_point;
        uint64_t samplerate;
 };
@@ -94,7 +93,7 @@ static int init(struct sr_output *o)
        struct context *ctx;
        struct sr_probe *probe;
        GSList *l;
-       uint64_t *samplerate;
+       GVariant *gvar;
 
        if (!o) {
                sr_warn("%s: o was NULL", __func__);
@@ -106,11 +105,6 @@ static int init(struct sr_output *o)
                return SR_ERR_ARG;
        }
 
-       if (!o->sdi->driver) {
-               sr_warn("%s: o->sdi->driver was NULL", __func__);
-               return SR_ERR_ARG;
-       }
-
        if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
                sr_warn("%s: ctx malloc failed", __func__);
                return SR_ERR_MALLOC;
@@ -118,20 +112,19 @@ static int init(struct sr_output *o)
 
        o->internal = ctx;
 
-       /* Get the probe names and the unitsize. */
+       /* Get the unitsize. */
        for (l = o->sdi->probes; l; l = l->next) {
                probe = l->data;
                if (!probe->enabled)
                        continue;
-               ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+               ctx->num_enabled_probes++;
        }
-       ctx->probelist[ctx->num_enabled_probes] = 0;
        ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-       if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
-               o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
-                               (const void **)&samplerate, o->sdi);
-               ctx->samplerate = *samplerate;
+       if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
+                       o->sdi) == SR_OK) {
+               ctx->samplerate = g_variant_get_uint64(gvar);
+               g_variant_unref(gvar);
        } else
                ctx->samplerate = 0;