gnuplot: proper error message when using gnuplot output without logic probe

[libsigrok.git] / output / gnuplot.c

diff --git a/output/gnuplot.c b/output/gnuplot.c
index 9e1f2af6c3e4e081278c828e6a6099e85557472a..cadd4fa3b8c2f4f46fdc742674e348561d975efa 100644 (file)
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/gnuplot: "
-#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/gnuplot"
 
 struct context {
        unsigned int num_enabled_probes;
@@ -87,16 +80,24 @@ static int init(struct sr_output *o)
        ctx->num_enabled_probes = 0;
        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++;
        }
+       if (ctx->num_enabled_probes <= 0) {
+               sr_err("%s: no logic probe enabled", __func__);
+               return SR_ERR;
+       }
+
        ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
        num_probes = g_slist_length(o->sdi->probes);
        comment[0] = '\0';
        samplerate = 0;
-       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) {
                samplerate = g_variant_get_uint64(gvar);
                g_variant_unref(gvar);
                if (!(frequency_s = sr_samplerate_string(samplerate))) {
@@ -113,6 +114,8 @@ static int init(struct sr_output *o)
        wbuf[0] = '\0';
        for (i = 0, l = o->sdi->probes; l; l = l->next, i++) {
                probe = l->data;
+               if (probe->type != SR_PROBE_LOGIC)
+                       continue;
                if (!probe->enabled)
                        continue;
                c = (char *)&wbuf + strlen((const char *)&wbuf);