X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=show.c;h=13415c46755d646af92c822e87c4d5d49e2a113c;hb=62a64762ea3532d12853d431622b8cd05adbcc8c;hp=ba15120660123a3aa110515749305cc8fc36dbc5;hpb=ad6520c433602a426e4e55fec2d5aef8fe11a5b5;p=sigrok-cli.git

diff --git a/show.c b/show.c
index ba15120..13415c4 100644
--- a/show.c
+++ b/show.c
@@ -23,9 +23,8 @@
 
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
-	const struct sr_input_format *ia = a, *ib = b;
-
-	return strcmp(ia->id, ib->id);
+	return strcmp(sr_input_id_get((struct sr_input_module *)a),
+			sr_input_id_get((struct sr_input_module *)b));
 }
 
 static gint sort_outputs(gconstpointer a, gconstpointer b)
@@ -53,7 +52,7 @@ static gint sort_pds(gconstpointer a, gconstpointer b)
 void show_version(void)
 {
 	struct sr_dev_driver **drivers, *driver;
-	struct sr_input_format **inputs, *input;
+	const struct sr_input_module **inputs, *input;
 	const struct sr_output_module **outputs, *output;
 	const GSList *l;
 	GSList *sl;
@@ -86,11 +85,12 @@ void show_version(void)
 	printf("Supported input formats:\n");
 	inputs = sr_input_list();
 	for (sl = NULL, i = 0; inputs[i]; i++)
-		sl = g_slist_append(sl, inputs[i]);
+		sl = g_slist_append(sl, (gpointer)inputs[i]);
 	sl = g_slist_sort(sl, sort_inputs);
 	for (l = sl; l; l = l->next) {
 		input = l->data;
-		printf("  %-20s %s\n", input->id, input->description);
+		printf("  %-20s %s\n", sr_input_id_get(input),
+				sr_input_description_get(input));
 	}
 	printf("\n");
 	g_slist_free(sl);
@@ -446,6 +446,10 @@ void show_dev_detail(void)
 
 			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) != SR_OK) {
+				if (tmp_str) {
+					/* Can't list it, but we have a value to show. */
+					printf("%s (current)", tmp_str);
+				}
 				printf("\n");
 				continue;
 			}
@@ -471,7 +475,7 @@ void show_dev_detail(void)
 				continue;
 			}
 
-			if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+			if (sr_config_get(sdi->driver, sdi, channel_group, srci->key, &gvar) == SR_OK) {
 				g_variant_get(gvar, "(tt)", &cur_low, &cur_high);
 				g_variant_unref(gvar);
 			} else {
@@ -495,7 +499,7 @@ void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_BOOL) {
 			printf("    %s: ", srci->id);
-			if (sr_config_get(sdi->driver, sdi, NULL, srci->key,
+			if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) == SR_OK) {
 				if (g_variant_get_boolean(gvar))
 					printf("on (current), off\n");
@@ -513,7 +517,7 @@ void show_dev_detail(void)
 				continue;
 			}
 
-			if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+			if (sr_config_get(sdi->driver, sdi, channel_group, srci->key, &gvar) == SR_OK) {
 				g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high);
 				g_variant_unref(gvar);
 			} else {
@@ -535,6 +539,15 @@ void show_dev_detail(void)
 			printf("\n");
 			g_variant_unref(gvar_list);
 
+		} else if (srci->datatype == SR_T_FLOAT) {
+			printf("    %s: ", srci->id);
+			if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
+					&gvar) == SR_OK) {
+				printf("%f\n", g_variant_get_double(gvar));
+				g_variant_unref(gvar);
+			} else
+				printf("on, off\n");
+
 		} else {
 
 			/* Everything else */
@@ -550,12 +563,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 +597,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 {
@@ -638,30 +657,72 @@ void show_pd_detail(void)
 }
 #endif
 
+void show_input(void)
+{
+	const struct sr_input_module *imod;
+	const struct sr_option **opts;
+	GSList *l;
+	int i;
+	char *s, **tok;
+
+	tok = g_strsplit(opt_input_format, ":", 0);
+	if (!tok[0] || !(imod = sr_input_find(tok[0])))
+		g_critical("Input module '%s' not found.", opt_input_format);
+
+	printf("ID: %s\nName: %s\n", sr_input_id_get(imod),
+			sr_input_name_get(imod));
+	printf("Description: %s\n", sr_input_description_get(imod));
+	if ((opts = sr_input_options_get(imod))) {
+		printf("Options:\n");
+		for (i = 0; opts[i]; i++) {
+			printf("  %s: %s", opts[i]->id, opts[i]->desc);
+			if (opts[i]->def) {
+				s = g_variant_print(opts[i]->def, FALSE);
+				printf(" (default %s", s);
+				g_free(s);
+				if (opts[i]->values) {
+					printf(", possible values ");
+					for (l = opts[i]->values; l; l = l->next) {
+						s = g_variant_print((GVariant *)l->data, FALSE);
+						printf("%s%s", s, l->next ? ", " : "");
+						g_free(s);
+					}
+				}
+				printf(")");
+			}
+			printf("\n");
+		}
+		sr_input_options_free(opts);
+	}
+	g_strfreev(tok);
+}
+
 void show_output(void)
 {
 	const struct sr_output_module *omod;
-	const struct sr_option *opt;
+	const struct sr_option **opts;
 	GSList *l;
-	char *s;
+	int i;
+	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),
 			sr_output_name_get(omod));
 	printf("Description: %s\n", sr_output_description_get(omod));
-	if ((opt = sr_output_options_get(omod))) {
+	if ((opts = sr_output_options_get(omod))) {
 		printf("Options:\n");
-		while (opt->id) {
-			printf("  %s: %s", opt->id, opt->desc);
-			if (opt->def) {
-				s = g_variant_print(opt->def, FALSE);
+		for (i = 0; opts[i]; i++) {
+			printf("  %s: %s", opts[i]->id, opts[i]->desc);
+			if (opts[i]->def) {
+				s = g_variant_print(opts[i]->def, FALSE);
 				printf(" (default %s", s);
 				g_free(s);
-				if (opt->values) {
+				if (opts[i]->values) {
 					printf(", possible values ");
-					for (l = opt->values; l; l = l->next) {
+					for (l = opts[i]->values; l; l = l->next) {
 						s = g_variant_print((GVariant *)l->data, FALSE);
 						printf("%s%s", s, l->next ? ", " : "");
 						g_free(s);
@@ -670,9 +731,9 @@ void show_output(void)
 				printf(")");
 			}
 			printf("\n");
-			opt++;
 		}
-		sr_output_options_free(omod);
+		sr_output_options_free(opts);
 	}
+	g_strfreev(tok);
 }