Rename 'struct sr_probe' to 'struct sr_channel' everywhere.

[libsigrok.git] / output / ols.c

diff --git a/output/ols.c b/output/ols.c
index 3c6e59413776870154bb33a9dc4d415512349c9d..19c4d993163e8c62a2295d1e8e9b3927a35c83b8 100644 (file)
--- a/output/ols.c
+++ b/output/ols.c
@@ -31,14 +31,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/ols: "
-#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/ols"
 
 struct context {
        uint64_t samplerate;
@@ -63,7 +56,7 @@ static int init(struct sr_output *o)
 
 static GString *gen_header(const struct sr_dev_inst *sdi, struct context *ctx)
 {
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        GSList *l;
        GString *s;
        GVariant *gvar;
@@ -78,8 +71,11 @@ static GString *gen_header(const struct sr_dev_inst *sdi, struct context *ctx)
        num_enabled_probes = 0;
        for (l = sdi->probes; l; l = l->next) {
                probe = l->data;
-               if (probe->enabled)
-                       num_enabled_probes++;
+               if (probe->type != SR_PROBE_LOGIC)
+                       continue;
+               if (!probe->enabled)
+                       continue;
+               num_enabled_probes++;
        }
 
        s = g_string_sized_new(512);