X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=main.c;h=e4d321b51b0d8faa1a818ffae36586db2f9675c3;hb=dc1feef11206af8868300875f497c147c1b97c3c;hp=1b17c526e1a31fca5546a083b7a0e052a8fb3a4b;hpb=24bd9719166584e3b4e6e6423d6d6bcbc1a88251;p=sigrok-cli.git
diff --git a/main.c b/main.c
index 1b17c52..e4d321b 100644
--- a/main.c
+++ b/main.c
@@ -17,9 +17,10 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
+#include
#include
#include
+#include "sigrok-cli.h"
struct sr_context *sr_ctx = NULL;
#ifdef HAVE_SRD
@@ -50,6 +51,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 +62,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,36 +74,11 @@ 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))
+ 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;
@@ -112,7 +88,9 @@ 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))
+ (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;
@@ -122,7 +100,7 @@ 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))
+ 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;
@@ -132,7 +110,7 @@ static void get_option(void)
{
struct sr_dev_inst *sdi;
struct sr_channel_group *cg;
- const struct sr_config_info *ci;
+ const struct sr_key_info *ci;
GSList *devices;
GVariant *gvar;
GHashTable *devargs;
@@ -155,7 +133,7 @@ static void get_option(void)
}
cg = select_channel_group(sdi);
- if (!(ci = sr_config_info_name_get(opt_get)))
+ 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)))
@@ -236,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) {
@@ -265,10 +241,14 @@ int main(int argc, char **argv)
if (opt_version)
show_version();
+ else if (opt_list_supported)
+ show_supported();
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