output: Use sr_config_get() wrapper

[libsigrok.git] / output / csv.c

diff --git a/output/csv.c b/output/csv.c
index c86fd7c919e7151635279b3711b2ad5a4a0bab79..0b70b2d6cf9803af0fc6c1a02a4d5dec6ace3c23 100644 (file)
--- a/output/csv.c
+++ b/output/csv.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>
  *
@@ -37,7 +37,6 @@
 struct context {
        unsigned int num_enabled_probes;
        unsigned int unitsize;
-       char *probelist[SR_MAX_NUM_PROBES + 1];
        uint64_t samplerate;
        GString *header;
        char separator;
@@ -60,10 +59,9 @@ static int init(struct sr_output *o)
        struct context *ctx;
        struct sr_probe *probe;
        GSList *l;
+       GVariant *gvar;
        int num_probes;
-       uint64_t *samplerate;
        time_t t;
-       unsigned int i;
 
        if (!o) {
                sr_err("%s: o was NULL", __func__);
@@ -75,11 +73,6 @@ static int init(struct sr_output *o)
                return SR_ERR_ARG;
        }
 
-       if (!o->sdi->driver) {
-               sr_err("%s: o->sdi->driver was NULL", __func__);
-               return SR_ERR_ARG;
-       }
-
        if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
                sr_err("%s: ctx malloc failed", __func__);
                return SR_ERR_MALLOC;
@@ -87,22 +80,21 @@ static int init(struct sr_output *o)
 
        o->internal = ctx;
 
-       /* Get the number of probes, their names, and the unitsize. */
+       /* Get the number of probes, and 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;
+               if (probe->enabled)
+                       ctx->num_enabled_probes++;
        }
-       ctx->probelist[ctx->num_enabled_probes] = 0;
+
        ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
        num_probes = g_slist_length(o->sdi->probes);
 
-       if (sr_dev_has_hwcap(o->sdi, SR_HWCAP_SAMPLERATE)) {
-               o->sdi->driver->info_get(SR_DI_CUR_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;
 
@@ -120,8 +112,11 @@ static int init(struct sr_output *o)
        /* Columns / channels */
        g_string_append_printf(ctx->header, "; Channels (%d/%d): ",
                               ctx->num_enabled_probes, num_probes);
-       for (i = 0; i < ctx->num_enabled_probes; i++)
-               g_string_append_printf(ctx->header, "%s, ", ctx->probelist[i]);
+       for (l = o->sdi->probes; l; l = l->next) {
+               probe = l->data;
+               if (probe->enabled)
+                       g_string_append_printf(ctx->header, "%s, ", probe->name);
+       }
        g_string_append_printf(ctx->header, "\n");
 
        return SR_OK;