X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=main.c;h=94f1c0f6491c25159573b73259fb59a4c7b2734f;hp=19d146df7fe9560fcdcd396419694ee31ce8d1f2;hb=c5e0e72ee3bcc799d1510c9fb91b3a0073766b2a;hpb=a8b4041ad4829aeb33e243d6a6a0c482be4658cd

diff --git a/main.c b/main.c
index 19d146d..94f1c0f 100644
--- a/main.c
+++ b/main.c
@@ -17,9 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
+#include <config.h>
 #include <stdlib.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 struct sr_context *sr_ctx = NULL;
 #ifdef HAVE_SRD
@@ -50,18 +51,20 @@ 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;
+	gboolean enabled;
+	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;
-			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);
 	}
@@ -71,6 +74,84 @@ int select_channels(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
+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 (sr_dev_config_capabilities_list(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)
+{
+	(void)driver;
+
+	if (sr_dev_config_capabilities_list(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 (sr_dev_config_capabilities_list(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_key_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_key_info_name_get(SR_KEY_CONFIG, 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;
@@ -133,8 +214,6 @@ int main(int argc, char **argv)
 		}
 		if (register_pds(opt_pds, opt_pd_annotations) != 0)
 			goto done;
-		if (setup_pd_stack(opt_pds, opt_pd_stack, opt_pd_annotations) != 0)
-			goto done;
 
 		/* Only one output type is ever shown. */
 		if (opt_pd_binary) {
@@ -166,6 +245,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
@@ -176,6 +257,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)