X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=main.c;h=1d3b33df800f1765f6247a7acafe33c603dd94c0;hp=d300748bed13b6f863466685454032deac536505;hb=6f7b4c5d7eb49642f8221a85ee6987751fcd81ce;hpb=ad6520c433602a426e4e55fec2d5aef8fe11a5b5

diff --git a/main.c b/main.c
index d300748..1d3b33d 100644
--- a/main.c
+++ b/main.c
@@ -50,13 +50,15 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
 int select_channels(struct sr_dev_inst *sdi)
 {
 	struct sr_channel *ch;
-	GSList *selected_channels, *l;
+	GSList *selected_channels, *l, *channels;
+
+	channels = sr_dev_inst_channels_get(sdi);
 
 	if (opt_channels) {
 		if (!(selected_channels = parse_channelstring(sdi, opt_channels)))
 			return SR_ERR;
 
-		for (l = sdi->channels; l; l = l->next) {
+		for (l = channels; l; l = l->next) {
 			ch = l->data;
 			if (g_slist_find(selected_channels, ch))
 				ch->enabled = TRUE;
@@ -71,6 +73,107 @@ 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;
+
+	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));
+	for (i = 0; i < num_opts; i++) {
+		if ((opts[i] & SR_CONF_MASK) == key) {
+			if ((opts[i] & capability) == capability)
+				return TRUE;
+			else
+				return FALSE;
+		}
+	}
+
+	return FALSE;
+}
+
+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;
+	struct sr_channel_group *cg;
+	const struct sr_config_info *ci;
+	GSList *devices;
+	GVariant *gvar;
+	GHashTable *devargs;
+	int ret;
+	char *s;
+	struct sr_dev_driver *driver;
+
+	if (!(devices = device_scan())) {
+		g_critical("No devices found.");
+		return;
+	}
+	sdi = devices->data;
+	g_slist_free(devices);
+
+	driver = sr_dev_inst_driver_get(sdi);
+
+	if (sr_dev_open(sdi) != SR_OK) {
+		g_critical("Failed to open device.");
+		return;
+	}
+
+	cg = select_channel_group(sdi);
+	if (!(ci = sr_config_info_name_get(opt_get)))
+		g_critical("Unknown option '%s'", opt_get);
+
+	if ((devargs = parse_generic_arg(opt_config, FALSE)))
+		set_dev_options(sdi, devargs);
+	else devargs = NULL;
+
+	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);
+	g_free(s);
+
+	g_variant_unref(gvar);
+	sr_dev_close(sdi);
+	if (devargs)
+		g_hash_table_destroy(devargs);
+}
+
 static void set_options(void)
 {
 	struct sr_dev_inst *sdi;
@@ -162,8 +265,12 @@ int main(int argc, char **argv)
 
 	if (opt_version)
 		show_version();
+	else if (opt_input_format && opt_show)
+		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
@@ -174,6 +281,8 @@ int main(int argc, char **argv)
 		show_dev_detail();
 	else if (opt_input_file)
 		load_input_file();
+	else if (opt_get)
+		get_option();
 	else if (opt_set)
 		set_options();
 	else if (opt_samples || opt_time || opt_frames || opt_continuous)