X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=4cdf7049da05e51809ba1f4277560fac5b33b55d;hp=9adee6792098d066e8f9c84e61db5bf23cd2679d;hb=b0f1c54057614508b8702ea2565ec4758019030d;hpb=6709a6946448e9178100e751803c0c5b58e3a396

diff --git a/show.c b/show.c
index 9adee67..4cdf704 100644
--- a/show.c
+++ b/show.c
@@ -45,12 +45,14 @@ static gint sort_drivers(gconstpointer a, gconstpointer b)
 	return strcmp(sdda->name, sddb->name);
 }
 
+#ifdef HAVE_SRD
 static gint sort_pds(gconstpointer a, gconstpointer b)
 {
 	const struct srd_decoder *sda = a, *sdb = b;
 
 	return strcmp(sda->id, sdb->id);
 }
+#endif
 
 void show_version(void)
 {
@@ -206,11 +208,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.");
@@ -282,20 +284,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
@@ -408,7 +437,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) {