X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=aec61f142d7aff4a90a38e32a4b80ad56fb45f2d;hp=8ee99da108141c90574d32c491ca096b3be4cd25;hb=ee639fb40fa43aa3553ef0229def9bcdb8338c2b;hpb=24bd9719166584e3b4e6e6423d6d6bcbc1a88251

diff --git a/show.c b/show.c
index 8ee99da..aec61f1 100644
--- a/show.c
+++ b/show.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <glib.h>
 #include <string.h>
+#include "sigrok-cli.h"
 
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
@@ -33,6 +33,12 @@ static gint sort_outputs(gconstpointer a, gconstpointer b)
 			sr_output_id_get((struct sr_output_module *)b));
 }
 
+static gint sort_transforms(gconstpointer a, gconstpointer b)
+{
+	return strcmp(sr_transform_id_get((struct sr_transform_module *)a),
+			sr_transform_id_get((struct sr_transform_module *)b));
+}
+
 static gint sort_drivers(gconstpointer a, gconstpointer b)
 {
 	const struct sr_dev_driver *sdda = a, *sddb = b;
@@ -54,6 +60,7 @@ void show_version(void)
 	struct sr_dev_driver **drivers, *driver;
 	const struct sr_input_module **inputs, *input;
 	const struct sr_output_module **outputs, *output;
+	const struct sr_transform_module **transforms, *transform;
 	const GSList *l;
 	GSList *sl;
 	int i;
@@ -71,7 +78,7 @@ void show_version(void)
 #endif
 
 	printf("Supported hardware drivers:\n");
-	drivers = sr_driver_list();
+	drivers = sr_driver_list(sr_ctx);
 	for (sl = NULL, i = 0; drivers[i]; i++)
 		sl = g_slist_append(sl, drivers[i]);
 	sl = g_slist_sort(sl, sort_drivers);
@@ -108,6 +115,19 @@ void show_version(void)
 	printf("\n");
 	g_slist_free(sl);
 
+	printf("Supported transform modules:\n");
+	transforms = sr_transform_list();
+	for (sl = NULL, i = 0; transforms[i]; i++)
+		sl = g_slist_append(sl, (gpointer)transforms[i]);
+	sl = g_slist_sort(sl, sort_transforms);
+	for (l = sl; l; l = l->next) {
+		transform = l->data;
+		printf("  %-20s %s\n", sr_transform_id_get(transform),
+				sr_transform_description_get(transform));
+	}
+	printf("\n");
+	g_slist_free(sl);
+
 #ifdef HAVE_SRD
 	if (srd_init(NULL) == SRD_OK) {
 		printf("Supported protocol decoders:\n");
@@ -288,8 +308,10 @@ void show_dev_detail(void)
 		return;
 	}
 
-	/* Selected channels and channel group may affect which options are
-	 * returned, or which values for them. */
+	/*
+	 * Selected channels and channel group may affect which options are
+	 * returned, or which values for them.
+	 */
 	select_channels(sdi);
 	channel_group = select_channel_group(sdi);
 
@@ -336,7 +358,7 @@ void show_dev_detail(void)
 					&num_elements, sizeof(int32_t));
 			printf("    Supported triggers: ");
 			for (i = 0; i < num_elements; i++) {
-				switch(int32[i]) {
+				switch (int32[i]) {
 				case SR_TRIGGER_ZERO:
 					c = '0';
 					break;
@@ -369,13 +391,15 @@ void show_dev_detail(void)
 			g_variant_unref(gvar_list);
 
 		} else if (key == SR_CONF_LIMIT_SAMPLES
-				&& config_key_has_cap(driver, sdi, cg, key, SR_CONF_LIST)) {
-			/* If implemented in config_list(), this denotes the
+				&& config_key_has_cap(driver, sdi, NULL, key, SR_CONF_LIST)) {
+			/*
+			 * If implemented in config_list(), this denotes the
 			 * maximum number of samples a device can send. This
 			 * really applies only to logic analyzers, and then
 			 * only to those that don't support compression, or
 			 * have it turned off by default. The values returned
-			 * are the low/high limits. */
+			 * are the low/high limits.
+			 */
 			if (sr_config_list(driver, sdi, channel_group, key,
 					&gvar) == SR_OK) {
 				g_variant_get(gvar, "(tt)", &low, &high);
@@ -790,3 +814,42 @@ void show_output(void)
 	g_strfreev(tok);
 }
 
+void show_transform(void)
+{
+	const struct sr_transform_module *tmod;
+	const struct sr_option **opts;
+	GSList *l;
+	int i;
+	char *s, **tok;
+
+	tok = g_strsplit(opt_transform_module, ":", 0);
+	if (!tok[0] || !(tmod = sr_transform_find(tok[0])))
+		g_critical("Transform module '%s' not found.", opt_transform_module);
+
+	printf("ID: %s\nName: %s\n", sr_transform_id_get(tmod),
+			sr_transform_name_get(tmod));
+	printf("Description: %s\n", sr_transform_description_get(tmod));
+	if ((opts = sr_transform_options_get(tmod))) {
+		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_transform_options_free(opts);
+	}
+	g_strfreev(tok);
+}