configure.ac: Bump package version to 0.7.1.

[sigrok-cli.git] / main.c

diff --git a/main.c b/main.c
index 43050962fa7f94e598ee9fe1b2d7028913a3bd44..689c2d57496ba5b4506698165318a88459ea7e2e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -78,7 +78,7 @@ 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(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;
@@ -90,7 +90,7 @@ int maybe_config_set(struct sr_dev_driver *driver,
 {
        (void)driver;
 
-       if (sr_dev_config_capabilities(sdi, cg, key) & SR_CONF_SET)
+       if (sr_dev_config_capabilities_list(sdi, cg, key) & SR_CONF_SET)
                return sr_config_set(sdi, cg, key, gvar);
 
        return SR_ERR_NA;
@@ -100,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 (sr_dev_config_capabilities(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;
@@ -138,7 +138,8 @@ static void get_option(void)
 
        if ((devargs = parse_generic_arg(opt_config, FALSE)))
                set_dev_options(sdi, devargs);
-       else devargs = NULL;
+       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));
@@ -214,8 +215,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) {
@@ -243,6 +242,8 @@ 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)