X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=9adee6792098d066e8f9c84e61db5bf23cd2679d;hp=74a50bb88368730753bb1cb0ae08a497d3aa10c5;hb=f4ffd032cfb0b8fe927d82bdba136f357b8dad79;hpb=b39f3a1a12b4a79b9a2d2a005b2474483438fa2a

diff --git a/show.c b/show.c
index 74a50bb..9adee67 100644
--- a/show.c
+++ b/show.c
@@ -18,22 +18,50 @@
  */
 
 #include "sigrok-cli.h"
-#include "config.h"
 #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;
+
+	return strcmp(ia->id, ib->id);
+}
+
+static gint sort_outputs(gconstpointer a, gconstpointer b)
+{
+	const struct sr_output_format *oa = a, *ob = b;
+
+	return strcmp(oa->id, ob->id);
+}
+
+static gint sort_drivers(gconstpointer a, gconstpointer b)
+{
+	const struct sr_dev_driver *sdda = a, *sddb = b;
+
+	return strcmp(sdda->name, sddb->name);
+}
+
+static gint sort_pds(gconstpointer a, gconstpointer b)
+{
+	const struct srd_decoder *sda = a, *sdb = b;
+
+	return strcmp(sda->id, sdb->id);
+}
+
 void show_version(void)
 {
-	struct sr_dev_driver **drivers;
-	struct sr_input_format **inputs;
-	struct sr_output_format **outputs;
+	struct sr_dev_driver **drivers, *driver;
+	struct sr_input_format **inputs, *input;
+	struct sr_output_format **outputs, *output;
+	const GSList *l;
+	GSList *sl;
 	int i;
 #ifdef HAVE_SRD
 	struct srd_decoder *dec;
-	const GSList *l;
 #endif
 
 	printf("sigrok-cli %s\n\n", VERSION);
@@ -47,45 +75,71 @@ void show_version(void)
 
 	printf("Supported hardware drivers:\n");
 	drivers = sr_driver_list();
-	for (i = 0; drivers[i]; i++) {
-		printf("  %-20s %s\n", drivers[i]->name, drivers[i]->longname);
+	for (sl = NULL, i = 0; drivers[i]; i++)
+		sl = g_slist_append(sl, drivers[i]);
+	sl = g_slist_sort(sl, sort_drivers);
+	for (l = sl; l; l = l->next) {
+		driver = l->data;
+		printf("  %-20s %s\n", driver->name, driver->longname);
 	}
 	printf("\n");
+	g_slist_free(sl);
 
 	printf("Supported input formats:\n");
 	inputs = sr_input_list();
-	for (i = 0; inputs[i]; i++)
-		printf("  %-20s %s\n", inputs[i]->id, inputs[i]->description);
+	for (sl = NULL, i = 0; inputs[i]; i++)
+		sl = g_slist_append(sl, 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("\n");
+	g_slist_free(sl);
 
 	printf("Supported output formats:\n");
 	outputs = sr_output_list();
-	for (i = 0; outputs[i]; i++)
-		printf("  %-20s %s\n", outputs[i]->id, outputs[i]->description);
-	printf("  %-20s %s\n", "sigrok", "Default file output format");
+	for (sl = NULL, i = 0; outputs[i]; i++)
+		sl = g_slist_append(sl, 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("\n");
+	g_slist_free(sl);
 
 #ifdef HAVE_SRD
 	if (srd_init(NULL) == SRD_OK) {
 		printf("Supported protocol decoders:\n");
 		srd_decoder_load_all();
-		for (l = srd_decoder_list(); l; l = l->next) {
+		sl = g_slist_copy((GSList *)srd_decoder_list());
+		sl = g_slist_sort(sl, sort_pds);
+		for (l = sl; l; l = l->next) {
 			dec = l->data;
 			printf("  %-20s %s\n", dec->id, dec->longname);
 			/* Print protocol description upon "-l 3" or higher. */
 			if (opt_loglevel >= SR_LOG_INFO)
 				printf("  %-20s %s\n", "", dec->desc);
 		}
+		g_slist_free(sl);
 		srd_exit();
 	}
 	printf("\n");
 #endif
 }
 
+static gint sort_channels(gconstpointer a, gconstpointer b)
+{
+	const struct sr_channel *pa = a, *pb = b;
+
+	return pa->index - pb->index;
+}
+
 static void print_dev_line(const struct sr_dev_inst *sdi)
 {
-	struct sr_probe *probe;
-	GSList *l;
+	struct sr_channel *ch;
+	GSList *sl, *l;
 	GString *s;
 	GVariant *gvar;
 
@@ -103,16 +157,18 @@ static void print_dev_line(const struct sr_dev_inst *sdi)
 		g_string_append_printf(s, "%s ", sdi->model);
 	if (sdi->version && sdi->version[0])
 		g_string_append_printf(s, "%s ", sdi->version);
-	if (sdi->probes) {
-		if (g_slist_length(sdi->probes) == 1) {
-			probe = sdi->probes->data;
-			g_string_append_printf(s, "with 1 probe: %s", probe->name);
+	if (sdi->channels) {
+		if (g_slist_length(sdi->channels) == 1) {
+			ch = sdi->channels->data;
+			g_string_append_printf(s, "with 1 channel: %s", ch->name);
 		} else {
-			g_string_append_printf(s, "with %d probes:", g_slist_length(sdi->probes));
-			for (l = sdi->probes; l; l = l->next) {
-				probe = l->data;
-				g_string_append_printf(s, " %s", probe->name);
+			sl = g_slist_sort(g_slist_copy(sdi->channels), sort_channels);
+			g_string_append_printf(s, "with %d channels:", g_slist_length(sl));
+			for (l = sl; l; l = l->next) {
+				ch = l->data;
+				g_string_append_printf(s, " %s", ch->name);
 			}
+			g_slist_free(sl);
 		}
 	}
 	g_string_append_printf(s, "\n");
@@ -142,11 +198,12 @@ void show_dev_detail(void)
 {
 	struct sr_dev_inst *sdi;
 	const struct sr_config_info *srci;
-	struct sr_probe *probe;
-	struct sr_probe_group *probe_group, *pg;
-	GSList *devices, *pgl, *prl;
+	struct sr_channel *ch;
+	struct sr_channel_group *channel_group, *cg;
+	GSList *devices, *cgl, *chl;
 	GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar;
 	gsize num_opts, num_elements;
+	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;
@@ -188,36 +245,36 @@ void show_dev_detail(void)
 		g_variant_unref(gvar_opts);
 	}
 
-	/* Selected probes and probe group may affect which options are
+	/* Selected channels and channel group may affect which options are
 	 * returned, or which values for them. */
-	select_probes(sdi);
-	probe_group = select_probe_group(sdi);
+	select_channels(sdi);
+	channel_group = select_channel_group(sdi);
 
-	if ((sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_DEVICE_OPTIONS,
+	if ((sr_config_list(sdi->driver, sdi, channel_group, SR_CONF_DEVICE_OPTIONS,
 			&gvar_opts)) != SR_OK)
 		/* Driver supports no device instance options. */
 		return;
 
-	if (sdi->probe_groups) {
-		printf("Probe groups:\n");
-		for (pgl = sdi->probe_groups; pgl; pgl = pgl->next) {
-			pg = pgl->data;
-			printf("    %s: channel%s", pg->name,
-					g_slist_length(pg->probes) > 1 ? "s" : "");
-			for (prl = pg->probes; prl; prl = prl->next) {
-				probe = prl->data;
-				printf(" %s", probe->name);
+	if (sdi->channel_groups) {
+		printf("Channel groups:\n");
+		for (cgl = sdi->channel_groups; cgl; cgl = cgl->next) {
+			cg = cgl->data;
+			printf("    %s: channel%s", cg->name,
+					g_slist_length(cg->channels) > 1 ? "s" : "");
+			for (chl = cg->channels; chl; chl = chl->next) {
+				ch = chl->data;
+				printf(" %s", ch->name);
 			}
 			printf("\n");
 		}
 	}
 
 	printf("Supported configuration options");
-	if (sdi->probe_groups) {
-		if (!probe_group)
-			printf(" across all probe groups");
+	if (sdi->channel_groups) {
+		if (!channel_group)
+			printf(" across all channel groups");
 		else
-			printf(" on probe group %s", probe_group->name);
+			printf(" on channel group %s", channel_group->name);
 	}
 	printf(":\n");
 	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(int32_t));
@@ -226,7 +283,7 @@ void show_dev_detail(void)
 			continue;
 
 		if (srci->key == SR_CONF_TRIGGER_TYPE) {
-			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) != SR_OK) {
 				printf("\n");
 				continue;
@@ -247,7 +304,7 @@ void show_dev_detail(void)
 			 * only to those that don't support compression, or
 			 * have it turned off by default. The values returned
 			 * are the low/high limits. */
-			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) != SR_OK) {
 				continue;
 			}
@@ -258,7 +315,7 @@ void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_SAMPLERATE) {
 			/* Supported samplerates */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_SAMPLERATE,
+			if (sr_config_list(sdi->driver, sdi, channel_group, SR_CONF_SAMPLERATE,
 					&gvar_dict) != SR_OK) {
 				printf("\n");
 				continue;
@@ -301,7 +358,7 @@ void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_BUFFERSIZE) {
 			/* Supported buffer sizes */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group,
+			if (sr_config_list(sdi->driver, sdi, channel_group,
 					SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
@@ -316,7 +373,7 @@ void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_TIMEBASE) {
 			/* Supported time bases */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group,
+			if (sr_config_list(sdi->driver, sdi, channel_group,
 					SR_CONF_TIMEBASE, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
@@ -335,7 +392,7 @@ void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_VDIV) {
 			/* Supported volts/div values */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group,
+			if (sr_config_list(sdi->driver, sdi, channel_group,
 					SR_CONF_VDIV, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
@@ -353,14 +410,14 @@ void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_CHAR) {
 			printf("    %s: ", srci->id);
-			if (sr_config_get(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) == SR_OK) {
 				tmp_str = g_strdup(g_variant_get_string(gvar, NULL));
 				g_variant_unref(gvar);
 			} else
 				tmp_str = NULL;
 
-			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar) != SR_OK) {
 				printf("\n");
 				continue;
@@ -381,7 +438,7 @@ void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_UINT64_RANGE) {
 			printf("    %s: ", srci->id);
-			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
 					&gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
@@ -421,6 +478,36 @@ void show_dev_detail(void)
 			} else
 				printf("on, off\n");
 
+		} else if (srci->datatype == SR_T_DOUBLE_RANGE) {
+			printf("    %s: ", srci->id);
+			if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
+					&gvar_list) != SR_OK) {
+				printf("\n");
+				continue;
+			}
+
+			if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+				g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high);
+				g_variant_unref(gvar);
+			} else {
+				dcur_low = 0;
+				dcur_high = 0;
+			}
+
+			num_elements = g_variant_n_children(gvar_list);
+			for (i = 0; i < num_elements; i++) {
+				gvar = g_variant_get_child_value(gvar_list, i);
+				g_variant_get(gvar, "(dd)", &dlow, &dhigh);
+				g_variant_unref(gvar);
+				if (i)
+					printf(", ");
+				printf("%.1f-%.1f", dlow, dhigh);
+				if (dlow == dcur_low && dhigh == dcur_high)
+					printf(" (current)");
+			}
+			printf("\n");
+			g_variant_unref(gvar_list);
+
 		} else {
 
 			/* Everything else */
@@ -437,11 +524,11 @@ void show_dev_detail(void)
 #ifdef HAVE_SRD
 void show_pd_detail(void)
 {
-	GSList *l, *ll;
+	GSList *l, *ll, *ol;
 	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);
@@ -477,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");
@@ -501,9 +588,14 @@ void show_pd_detail(void)
 		if (dec->options) {
 			for (l = dec->options; l; l = l->next) {
 				o = l->data;
+				printf("- %s: %s (", o->id, o->desc);
+				for (ol = o->values; ol; ol = ol->next) {
+					val = g_variant_print(ol->data, FALSE);
+					printf("%s, ", val);
+					g_free(val);
+				}
 				val = g_variant_print(o->def, FALSE);
-				printf("- %s: %s (default %s)\n", o->id,
-					o->desc, val);
+				printf("default %s)\n", val);
 				g_free(val);
 			}
 		} else {