accept multiple --get requests for multiple channel groups

Extend the user interface. Accept multiple --get specs which each can query
multiple parameters from a channel group, and optionally can select the
channel group (including the device itself) in their first item. Support
the -g selection for backwards compatibility and/or convenience.

diff --git a/main.c b/main.c
index 1de4b16e8ea0adbaeff9a2e2aebde7daeb1570e5..b128c8800e2fca733db67aa77a5769338ba56f4c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -106,43 +106,29 @@ int maybe_config_list(struct sr_dev_driver *driver,
        return SR_ERR_NA;
 }
 
-static void get_option(void)
+static void get_option(struct sr_dev_inst *sdi,
+       struct sr_channel_group *cg, const char *opt)
 {
-       struct sr_dev_inst *sdi;
-       struct sr_channel_group *cg;
+       struct sr_dev_driver *driver;
        const struct sr_key_info *ci;
-       GSList *devices;
-       GVariant *gvar;
        int ret;
-       char *s;
-       struct sr_dev_driver *driver;
+       GVariant *gvar;
        const struct sr_key_info *srci, *srmqi, *srmqfi;
        uint32_t mq;
        uint64_t mask, mqflags;
        unsigned int j;
-
-       if (!(devices = device_scan())) {
-               g_critical("No devices found.");
-               return;
-       }
-       sdi = devices->data;
-       g_slist_free(devices);
+       char *s;
 
        driver = sr_dev_inst_driver_get(sdi);
 
-       if (sr_dev_open(sdi) != SR_OK) {
-               g_critical("Failed to open device.");
-               return;
-       }
+       ci = sr_key_info_name_get(SR_KEY_CONFIG, opt);
+       if (!ci)
+               g_critical("Unknown option '%s'", opt);
 
-       cg = lookup_channel_group(sdi, NULL);
-       if (!(ci = sr_key_info_name_get(SR_KEY_CONFIG, opt_get)))
-               g_critical("Unknown option '%s'", opt_get);
+       ret = maybe_config_get(driver, sdi, cg, ci->key, &gvar);
+       if (ret != SR_OK)
+               g_critical("Failed to get '%s': %s", opt, sr_strerror(ret));
 
-       set_dev_options_array(sdi, opt_configs);
-
-       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));
        srci = sr_key_info_get(SR_KEY_CONFIG, ci->key);
        if (srci && srci->datatype == SR_T_MQ) {
                g_variant_get(gvar, "(ut)", &mq, &mqflags);
@@ -166,6 +152,52 @@ static void get_option(void)
        }
 
        g_variant_unref(gvar);
+}
+
+static void get_options(void)
+{
+       GSList *devices;
+       struct sr_dev_inst *sdi;
+       size_t get_idx;
+       char *get_text, *cg_name;
+       GHashTable *args;
+       GHashTableIter iter;
+       gpointer key, value;
+       struct sr_channel_group *cg;
+
+       /* Lookup and open the device. */
+       devices = device_scan();
+       if (!devices) {
+               g_critical("No devices found.");
+               return;
+       }
+       sdi = devices->data;
+       g_slist_free(devices);
+
+       if (sr_dev_open(sdi) != SR_OK) {
+               g_critical("Failed to open device.");
+               return;
+       }
+
+       /* Set configuration values when -c was specified. */
+       set_dev_options_array(sdi, opt_configs);
+
+       /* Get configuration values which were specified by --get. */
+       for (get_idx = 0; (get_text = opt_gets[get_idx]); get_idx++) {
+               args = parse_generic_arg(get_text, FALSE, "channel_group");
+               if (!args)
+                       continue;
+               cg_name = g_hash_table_lookup(args, "sigrok_key");
+               cg = lookup_channel_group(sdi, cg_name);
+               g_hash_table_iter_init(&iter, args);
+               while (g_hash_table_iter_next(&iter, &key, &value)) {
+                       if (g_ascii_strcasecmp(key, "sigrok_key") == 0)
+                               continue;
+                       get_option(sdi, cg, key);
+               }
+       }
+
+       /* Close the device. */
        sr_dev_close(sdi);
 }
 
@@ -282,8 +314,8 @@ int main(int argc, char **argv)
                show_dev_detail();
        else if (opt_input_file)
                load_input_file(FALSE);
-       else if (opt_get)
-               get_option();
+       else if (opt_gets)
+               get_options();
        else if (opt_set)
                set_options();
        else if (opt_samples || opt_time || opt_frames || opt_continuous)

diff --git a/options.c b/options.c
index 8d17e33cc0e8fd7b4998095ab7c8e9de1aed214a..2573bd4c17b6cb861be37239070ff6e7bc8e07ef 100644 (file)
--- a/options.c
+++ b/options.c
@@ -51,7 +51,7 @@ gchar *opt_time = NULL;
 gchar *opt_samples = NULL;
 gchar *opt_frames = NULL;
 gboolean opt_continuous = FALSE;
-gchar *opt_get = NULL;
+gchar **opt_gets = NULL;
 gboolean opt_set = FALSE;
 gboolean opt_list_serial = FALSE;
 
@@ -93,7 +93,6 @@ CHECK_ONCE(opt_pd_binary)
 CHECK_ONCE(opt_time)
 CHECK_ONCE(opt_samples)
 CHECK_ONCE(opt_frames)
-CHECK_ONCE(opt_get)
 
 #undef CHECK_STR_ONCE
 
@@ -159,7 +158,8 @@ static const GOptionEntry optargs[] = {
                        "Number of frames to acquire", NULL},
        {"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous,
                        "Sample continuously", NULL},
-       {"get", 0, 0, G_OPTION_ARG_CALLBACK, &check_opt_get, "Get device options only", NULL},
+       {"get", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_gets,
+                       "Get device options only", NULL},
        {"set", 0, 0, G_OPTION_ARG_NONE, &opt_set, "Set device options only", NULL},
        {"list-serial", 0, 0, G_OPTION_ARG_NONE, &opt_list_serial, "List available serial/HID/BT/BLE ports", NULL},
        {NULL, 0, 0, 0, NULL, NULL, NULL}

diff --git a/sigrok-cli.h b/sigrok-cli.h
index 51ce454a33722ddecefa4a44154e153c33914a6f..2c0fbdcf57d2358b9864cce8676b39e1e7bba1f0 100644 (file)
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -151,7 +151,7 @@ extern gchar *opt_time;
 extern gchar *opt_samples;
 extern gchar *opt_frames;
 extern gboolean opt_continuous;
-extern gchar *opt_get;
+extern gchar **opt_gets;
 extern gboolean opt_set;
 extern gboolean opt_list_serial;
 int parse_options(int argc, char **argv);