X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=9adee6792098d066e8f9c84e61db5bf23cd2679d;hp=0b6d8f4fd5a9e2f9a824187fc6410338c94c6f11;hb=6709a6946448e9178100e751803c0c5b58e3a396;hpb=029d73fe03db2656ceb2ca0f5a3fea57393fdfda diff --git a/show.c b/show.c index 0b6d8f4..9adee67 100644 --- a/show.c +++ b/show.c @@ -18,7 +18,6 @@ */ #include "sigrok-cli.h" -#include "config.h" #include #include @@ -529,7 +528,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 +564,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");