X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fols.c;h=9f9cc957bdb743566e01a96570b46bafb8f6b8d2;hb=fadd07072b283f7040036a1050e23e7af43f1324;hp=3c6e59413776870154bb33a9dc4d415512349c9d;hpb=8f996b89481670219c7576e2c68b128a0a2ce026;p=libsigrok.git diff --git a/output/ols.c b/output/ols.c index 3c6e5941..9f9cc957 100644 --- 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; @@ -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);