X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=main.c;h=a53566e8960b31b24ce3b89e6e68edd5b62e841d;hp=81dc4ad21055a11bfc6f199d1dff732e388eb620;hb=662a1e27fa9573a35a6f9a6f699dee2be447826a;hpb=c6fa2b2e53d04462bd9fd0033b99e9165323762a

diff --git a/main.c b/main.c
index 81dc4ad..a53566e 100644
--- a/main.c
+++ b/main.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <stdlib.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 struct sr_context *sr_ctx = NULL;
 #ifdef HAVE_SRD
@@ -50,6 +50,7 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
 int select_channels(struct sr_dev_inst *sdi)
 {
 	struct sr_channel *ch;
+	gboolean enabled;
 	GSList *selected_channels, *l, *channels;
 
 	channels = sr_dev_inst_channels_get(sdi);
@@ -60,10 +61,9 @@ int select_channels(struct sr_dev_inst *sdi)
 
 		for (l = channels; l; l = l->next) {
 			ch = l->data;
-			if (g_slist_find(selected_channels, ch))
-				ch->enabled = TRUE;
-			else
-				ch->enabled = FALSE;
+			enabled = (g_slist_find(selected_channels, ch) != NULL);
+			if (sr_dev_channel_enable(ch, enabled) != SR_OK)
+				return SR_ERR;
 		}
 		g_slist_free(selected_channels);
 	}
@@ -73,6 +73,65 @@ int select_channels(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
+gboolean config_key_has_cap(struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
+		uint32_t key, uint32_t capability)
+{
+	GVariant *gvar_opts;
+	const uint32_t *opts;
+	gsize num_opts, i;
+	gboolean result;
+
+	if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS,
+			&gvar_opts) != SR_OK)
+		return FALSE;
+
+	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
+	result = FALSE;
+	for (i = 0; i < num_opts; i++) {
+		if ((opts[i] & SR_CONF_MASK) == key) {
+			if ((opts[i] & capability) == capability)
+				result = TRUE;
+			else
+				result = FALSE;
+			break;
+		}
+	}
+	g_variant_unref(gvar_opts);
+
+	return result;
+}
+
+int maybe_config_get(struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
+		uint32_t key, GVariant **gvar)
+{
+	if (config_key_has_cap(driver, sdi, cg, key, SR_CONF_GET))
+		return sr_config_get(driver, sdi, cg, key, gvar);
+
+	return SR_ERR_NA;
+}
+
+int maybe_config_set(struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
+		uint32_t key, GVariant *gvar)
+{
+	if (config_key_has_cap(driver, sdi, cg, key, SR_CONF_SET))
+		return sr_config_set(sdi, cg, key, gvar);
+
+	return SR_ERR_NA;
+}
+
+int maybe_config_list(struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
+		uint32_t key, GVariant **gvar)
+{
+	if (config_key_has_cap(driver, sdi, cg, key, SR_CONF_LIST))
+		return sr_config_list(driver, sdi, cg, key, gvar);
+
+	return SR_ERR_NA;
+}
+
 static void get_option(void)
 {
 	struct sr_dev_inst *sdi;
@@ -107,7 +166,7 @@ static void get_option(void)
 		set_dev_options(sdi, devargs);
 	else devargs = NULL;
 
-	if ((ret = sr_config_get(driver, sdi, cg, ci->key, &gvar)) != SR_OK)
+	if ((ret = maybe_config_get(driver, sdi, cg, ci->key, &gvar)) != SR_OK)
 		g_critical("Failed to get '%s': %s", opt_get, sr_strerror(ret));
 	s = g_variant_print(gvar, FALSE);
 	printf("%s\n", s);
@@ -214,6 +273,8 @@ int main(int argc, char **argv)
 		show_input();
 	else if (opt_output_format && opt_show)
 		show_output();
+	else if (opt_transform_module && opt_show)
+		show_transform();
 	else if (opt_scan_devs)
 		show_dev_list();
 #ifdef HAVE_SRD