README: Drop trailing whitespace.

[sigrok-cli.git] / main.c

diff --git a/main.c b/main.c
index a5749529e82859c00f38746a8d4d1cea9afaf597..e4d321b51b0d8faa1a818ffae36586db2f9675c3 100644 (file)
--- 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,15 +74,49 @@ 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_config_info *ci;
+       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.");
@@ -88,16 +125,22 @@ static void get_option(void)
        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)))
+       if (!(ci = sr_key_info_name_get(SR_KEY_CONFIG, opt_get)))
                g_critical("Unknown option '%s'", opt_get);
 
-       if ((ret = sr_config_get(sdi->driver, sdi, cg, ci->key, &gvar)) != SR_OK)
+       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);
@@ -105,6 +148,8 @@ static void get_option(void)
 
        g_variant_unref(gvar);
        sr_dev_close(sdi);
+       if (devargs)
+               g_hash_table_destroy(devargs);
 }
 
 static void set_options(void)
@@ -169,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) {
@@ -198,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