X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=show.c;h=4c0cd8f6737667e3322307f3173da232f63ac1a4;hb=e786e625d3e3b63ea5e85b98c9e1f0281abdc2d5;hp=ba15120660123a3aa110515749305cc8fc36dbc5;hpb=ad6520c433602a426e4e55fec2d5aef8fe11a5b5;p=sigrok-cli.git

diff --git a/show.c b/show.c
index ba15120..4c0cd8f 100644
--- a/show.c
+++ b/show.c
@@ -550,12 +550,13 @@ void show_dev_detail(void)
 #ifdef HAVE_SRD
 void show_pd_detail(void)
 {
-	GSList *l, *ll, *ol;
 	struct srd_decoder *dec;
 	struct srd_decoder_option *o;
-	char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
 	struct srd_channel *pdch;
 	struct srd_decoder_annotation_row *r;
+	GSList *l, *ll, *ol;
+	int idx;
+	char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
 
 	pdtokens = g_strsplit(opt_pds, ",", -1);
 	for (pdtok = pdtokens; *pdtok; pdtok++) {
@@ -583,8 +584,13 @@ void show_pd_detail(void)
 			for (l = dec->annotation_rows; l; l = l->next) {
 				r = l->data;
 				printf("- %s (%s): ", r->id, r->desc);
-				for (ll = r->ann_classes; ll; ll = ll->next)
-					printf("%d ", GPOINTER_TO_INT(ll->data));
+				for (ll = r->ann_classes; ll; ll = ll->next) {
+					idx = GPOINTER_TO_INT(ll->data);
+					ann = g_slist_nth_data(dec->annotations, idx);
+					printf("%s", ann[0]);
+					if (ll->next)
+						printf(", ");
+				}
 				printf("\n");
 			}
 		} else {
@@ -643,9 +649,10 @@ void show_output(void)
 	const struct sr_output_module *omod;
 	const struct sr_option *opt;
 	GSList *l;
-	char *s;
+	char *s, **tok;
 
-	if (!(omod = sr_output_find(opt_output_format)))
+	tok = g_strsplit(opt_output_format, ":", 0);
+	if (!tok[0] || !(omod = sr_output_find(tok[0])))
 		g_critical("Output module '%s' not found.", opt_output_format);
 
 	printf("ID: %s\nName: %s\n", sr_output_id_get(omod),
@@ -674,5 +681,6 @@ void show_output(void)
 		}
 		sr_output_options_free(omod);
 	}
+	g_strfreev(tok);
 }