From: Uwe Hermann <redacted>
Date: Fri, 31 Jan 2014 17:23:13 +0000 (+0100)
Subject: show: Add support for showing PD annotation rows.
X-Git-Tag: sigrok-cli-0.5.0~40
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1eb46be87ba64500504044da46d77e059193ccc4;p=sigrok-cli.git

show: Add support for showing PD annotation rows.
---

diff --git a/show.c b/show.c
index ee14037..0b33d68 100644
--- a/show.c
+++ b/show.c
@@ -437,11 +437,12 @@ void show_dev_detail(void)
 #ifdef HAVE_SRD
 void show_pd_detail(void)
 {
-	GSList *l;
+	GSList *l, *ll;
 	struct srd_decoder *dec;
 	struct srd_decoder_option *o;
 	char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
 	struct srd_probe *p;
+	struct srd_decoder_annotation_row *r;
 
 	pdtokens = g_strsplit(opt_pds, ",", -1);
 	for (pdtok = pdtokens; *pdtok; pdtok++) {
@@ -464,6 +465,18 @@ void show_pd_detail(void)
 		} else {
 			printf("None.\n");
 		}
+		printf("Annotation rows:\n");
+		if (dec->annotation_rows) {
+			for (l = dec->annotation_rows; l; l = l->next) {
+				r = l->data;
+				printf("- %s (%s): ", r->desc, r->id);
+				for (ll = r->ann_classes; ll; ll = ll->next)
+					printf("%d ", GPOINTER_TO_INT(ll->data));
+				printf("\n");
+			}
+		} else {
+			printf("None.\n");
+		}
 		printf("Required probes:\n");
 		if (dec->probes) {
 			for (l = dec->probes; l; l = l->next) {
@@ -484,14 +497,16 @@ void show_pd_detail(void)
 		} else {
 			printf("None.\n");
 		}
+		printf("Options:\n");
 		if (dec->options) {
-			printf("Options:\n");
 			for (l = dec->options; l; l = l->next) {
 				o = l->data;
 				val = g_variant_print(o->def, FALSE);
 				printf("- %s: %s (default %s)\n", o->id, o->desc, val);
 				g_free(val);
 			}
+		} else {
+			printf("None.\n");
 		}
 		if ((doc = srd_decoder_doc_get(dec))) {
 			printf("Documentation:\n%s\n",