Centralise duplicated logging helper defines.

[libsigrok.git] / output / csv.c

diff --git a/output/csv.c b/output/csv.c
index a671c292990d11ad35724651488e98392b637092..51cc8572145cf925d3d73c6aa00b14d92f758983 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>
  *
@@ -25,19 +25,11 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/csv: "
-#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)
+#define LOG_PREFIX "output/csv"
 
 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 +52,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 +66,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 +73,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_CONF_SAMPLERATE)) {
-               o->sdi->driver->config_get(SR_DI_CUR_SAMPLERATE,
-                               (const void **)&samplerate, o->sdi);
-               ctx->samplerate = *samplerate;
+       if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+                       &gvar) == SR_OK) {
+               ctx->samplerate = g_variant_get_uint64(gvar);
+               g_variant_unref(gvar);
        } else
                ctx->samplerate = 0;
 
@@ -120,8 +105,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;
@@ -177,8 +165,7 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 {
        struct context *ctx;
        GString *outstr;
-       uint64_t sample, i;
-       int j;
+       uint64_t sample, i, j;
 
        if (!o) {
                sr_err("%s: o was NULL", __func__);
@@ -205,7 +192,7 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 
        for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
                memcpy(&sample, data_in + i, ctx->unitsize);
-               for (j = ctx->num_enabled_probes - 1; j >= 0; j--) {
+               for (j = 0; j < ctx->num_enabled_probes; j++) {
                        g_string_append_printf(outstr, "%d%c",
                                (int)((sample & (1 << j)) >> j),
                                ctx->separator);