X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=ba15120660123a3aa110515749305cc8fc36dbc5;hp=3ecb3194e2aa0c19060e39ff1288bc8eefb1e19b;hb=ad6520c433602a426e4e55fec2d5aef8fe11a5b5;hpb=628197af18a8019eb9fd5d0aa280e7f4eca7f1ac

diff --git a/show.c b/show.c
index 3ecb319..ba15120 100644
--- a/show.c
+++ b/show.c
@@ -21,9 +21,6 @@
 #include <glib.h>
 #include <string.h>
 
-extern gint opt_loglevel;
-extern gchar *opt_pds;
-
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
 	const struct sr_input_format *ia = a, *ib = b;
@@ -33,9 +30,8 @@ static gint sort_inputs(gconstpointer a, gconstpointer b)
 
 static gint sort_outputs(gconstpointer a, gconstpointer b)
 {
-	const struct sr_output_format *oa = a, *ob = b;
-
-	return strcmp(oa->id, ob->id);
+	return strcmp(sr_output_id_get((struct sr_output_module *)a),
+			sr_output_id_get((struct sr_output_module *)b));
 }
 
 static gint sort_drivers(gconstpointer a, gconstpointer b)
@@ -58,7 +54,7 @@ void show_version(void)
 {
 	struct sr_dev_driver **drivers, *driver;
 	struct sr_input_format **inputs, *input;
-	struct sr_output_format **outputs, *output;
+	const struct sr_output_module **outputs, *output;
 	const GSList *l;
 	GSList *sl;
 	int i;
@@ -102,11 +98,12 @@ void show_version(void)
 	printf("Supported output formats:\n");
 	outputs = sr_output_list();
 	for (sl = NULL, i = 0; outputs[i]; i++)
-		sl = g_slist_append(sl, outputs[i]);
+		sl = g_slist_append(sl, (gpointer)outputs[i]);
 	sl = g_slist_sort(sl, sort_outputs);
 	for (l = sl; l; l = l->next) {
 		output = l->data;
-		printf("  %-20s %s\n", output->id, output->description);
+		printf("  %-20s %s\n", sr_output_id_get(output),
+				sr_output_description_get(output));
 	}
 	printf("\n");
 	g_slist_free(sl);
@@ -208,11 +205,11 @@ void show_dev_detail(void)
 	double dlow, dhigh, dcur_low, dcur_high;
 	const uint64_t *uint64, p, q, low, high;
 	uint64_t cur_low, cur_high;
-	const int32_t *opts;
+	const int32_t *int32, *opts;
 	unsigned int num_devices, o, i;
 	char *tmp_str;
-	char *s;
-	const char *charopts, **stropts;
+	char *s, c;
+	const char **stropts;
 
 	if (!(devices = device_scan())) {
 		g_critical("No devices found.");
@@ -227,6 +224,7 @@ void show_dev_detail(void)
 	}
 
 	sdi = devices->data;
+	g_slist_free(devices);
 	print_dev_line(sdi);
 
 	if (sr_dev_open(sdi) != SR_OK) {
@@ -284,20 +282,47 @@ void show_dev_detail(void)
 		if (!(srci = sr_config_info_get(opts[o])))
 			continue;
 
-		if (srci->key == SR_CONF_TRIGGER_TYPE) {
+		if (srci->key == SR_CONF_TRIGGER_MATCH) {
 			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
-					&gvar) != SR_OK) {
+					&gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
 			}
-			charopts = g_variant_get_string(gvar, NULL);
+			int32 = g_variant_get_fixed_array(gvar_list,
+					&num_elements, sizeof(int32_t));
 			printf("    Supported triggers: ");
-			while (*charopts) {
-				printf("%c ", *charopts);
-				charopts++;
+			for (i = 0; i < num_elements; i++) {
+				switch(int32[i]) {
+				case SR_TRIGGER_ZERO:
+					c = '0';
+					break;
+				case SR_TRIGGER_ONE:
+					c = '1';
+					break;
+				case SR_TRIGGER_RISING:
+					c = 'r';
+					break;
+				case SR_TRIGGER_FALLING:
+					c = 'f';
+					break;
+				case SR_TRIGGER_EDGE:
+					c = 'e';
+					break;
+				case SR_TRIGGER_OVER:
+					c = 'o';
+					break;
+				case SR_TRIGGER_UNDER:
+					c = 'u';
+					break;
+				default:
+					c = 0;
+					break;
+				}
+				if (c)
+					printf("%c ", c);
 			}
 			printf("\n");
-			g_variant_unref(gvar);
+			g_variant_unref(gvar_list);
 
 		} else if (srci->key == SR_CONF_LIMIT_SAMPLES) {
 			/* If implemented in config_list(), this denotes the
@@ -410,7 +435,7 @@ void show_dev_detail(void)
 			}
 			g_variant_unref(gvar_list);
 
-		} else if (srci->datatype == SR_T_CHAR) {
+		} else if (srci->datatype == SR_T_STRING) {
 			printf("    %s: ", srci->id);
 			if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) == SR_OK) {
@@ -519,7 +544,6 @@ void show_dev_detail(void)
 	g_variant_unref(gvar_opts);
 
 	sr_dev_close(sdi);
-	g_slist_free(devices);
 
 }
 
@@ -614,3 +638,41 @@ void show_pd_detail(void)
 }
 #endif
 
+void show_output(void)
+{
+	const struct sr_output_module *omod;
+	const struct sr_option *opt;
+	GSList *l;
+	char *s;
+
+	if (!(omod = sr_output_find(opt_output_format)))
+		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))) {
+		printf("Options:\n");
+		while (opt->id) {
+			printf("  %s: %s", opt->id, opt->desc);
+			if (opt->def) {
+				s = g_variant_print(opt->def, FALSE);
+				printf(" (default %s", s);
+				g_free(s);
+				if (opt->values) {
+					printf(", possible values ");
+					for (l = opt->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");
+			opt++;
+		}
+		sr_output_options_free(omod);
+	}
+}
+