atten-pps3xxx: Initial driver skeleton.

[libsigrok.git] / output / csv.c

diff --git a/output/csv.c b/output/csv.c
index 3eda9bf99a95f62df5a966ff933e1861782dd020..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,8 +76,11 @@ 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;
@@ -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");