Fix compile without decoding support.

[sigrok-cli.git] / show.c

diff --git a/show.c b/show.c
index 0b6d8f4fd5a9e2f9a824187fc6410338c94c6f11..3ecb3194e2aa0c19060e39ff1288bc8eefb1e19b 100644 (file)
--- a/show.c
+++ b/show.c
@@ -18,7 +18,6 @@
  */
 
 #include "sigrok-cli.h"
-#include "config.h"
 #include <glib.h>
 #include <string.h>
 
@@ -46,12 +45,14 @@ static gint sort_drivers(gconstpointer a, gconstpointer b)
        return strcmp(sdda->name, sddb->name);
 }
 
+#ifdef HAVE_SRD
 static gint sort_pds(gconstpointer a, gconstpointer b)
 {
        const struct srd_decoder *sda = a, *sdb = b;
 
        return strcmp(sda->id, sdb->id);
 }
+#endif
 
 void show_version(void)
 {
@@ -529,7 +530,7 @@ void show_pd_detail(void)
        struct srd_decoder *dec;
        struct srd_decoder_option *o;
        char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
-       struct srd_probe *p;
+       struct srd_channel *pdch;
        struct srd_decoder_annotation_row *r;
 
        pdtokens = g_strsplit(opt_pds, ",", -1);
@@ -565,22 +566,22 @@ void show_pd_detail(void)
                } else {
                        printf("None.\n");
                }
-               printf("Required probes:\n");
-               if (dec->probes) {
-                       for (l = dec->probes; l; l = l->next) {
-                               p = l->data;
+               printf("Required channels:\n");
+               if (dec->channels) {
+                       for (l = dec->channels; l; l = l->next) {
+                               pdch = l->data;
                                printf("- %s (%s): %s\n",
-                                      p->id, p->name, p->desc);
+                                      pdch->id, pdch->name, pdch->desc);
                        }
                } else {
                        printf("None.\n");
                }
-               printf("Optional probes:\n");
-               if (dec->opt_probes) {
-                       for (l = dec->opt_probes; l; l = l->next) {
-                               p = l->data;
+               printf("Optional channels:\n");
+               if (dec->opt_channels) {
+                       for (l = dec->opt_channels; l; l = l->next) {
+                               pdch = l->data;
                                printf("- %s (%s): %s\n",
-                                      p->id, p->name, p->desc);
+                                      pdch->id, pdch->name, pdch->desc);
                        }
                } else {
                        printf("None.\n");