Make sure to delete temporary metadata file after use.

[libsigrok.git] / output / csv.c

diff --git a/output/csv.c b/output/csv.c
index 0a7c50443efdb6454941375fcdada8443a59e6df..6de9ac3f155bfb7a7278631e5ce568a80efc751d 100644 (file)
--- a/output/csv.c
+++ b/output/csv.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/csv: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/csv"
 
 struct context {
        unsigned int num_enabled_probes;
@@ -83,16 +76,19 @@ static int init(struct sr_output *o)
        /* Get the number of probes, and the unitsize. */
        for (l = o->sdi->probes; l; l = l->next) {
                probe = l->data;
-               if (probe->enabled)
-                       ctx->num_enabled_probes++;
+               if (probe->type != SR_PROBE_LOGIC)
+                       continue;
+               if (!probe->enabled)
+                       continue;
+               ctx->num_enabled_probes++;
        }
 
        ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
        num_probes = g_slist_length(o->sdi->probes);
 
-       if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
-                       o->sdi) == SR_OK) {
+       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
@@ -114,8 +110,11 @@ static int init(struct sr_output *o)
                               ctx->num_enabled_probes, num_probes);
        for (l = o->sdi->probes; l; l = l->next) {
                probe = l->data;
-               if (probe->enabled)
-                       g_string_append_printf(ctx->header, "%s, ", probe->name);
+               if (probe->type != SR_PROBE_LOGIC)
+                       continue;
+               if (!probe->enabled)
+                       continue;
+               g_string_append_printf(ctx->header, "%s, ", probe->name);
        }
        g_string_append_printf(ctx->header, "\n");
 
@@ -172,8 +171,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__);
@@ -200,7 +198,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);