X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=7da744431154c134b5bee897bc24f817cc774e46;hb=5e6a040273d5b6aadb77a2a8736bc32b08d74649;hp=2dc830817df44c4eab739421a275b269e4a73a1b;hpb=2be182e6437fb082aedca653fdc106d702518db0;p=sigrok-cli.git
diff --git a/device.c b/device.c
index 2dc8308..7da7444 100644
--- a/device.c
+++ b/device.c
@@ -17,43 +17,11 @@
* along with this program. If not, see .
*/
-#include "config.h"
+#include
#include
-#include
+#include
#include "sigrok-cli.h"
-extern struct sr_context *sr_ctx;
-extern gchar *opt_drv;
-extern gchar *opt_probe_group;
-
-/* Convert driver options hash to GSList of struct sr_config. */
-static GSList *hash_to_hwopt(GHashTable *hash)
-{
- const struct sr_config_info *srci;
- struct sr_config *src;
- GList *gl, *keys;
- GSList *opts;
- char *key, *value;
-
- keys = g_hash_table_get_keys(hash);
- opts = NULL;
- for (gl = keys; gl; gl = gl->next) {
- key = gl->data;
- if (!(srci = sr_config_info_name_get(key))) {
- g_critical("Unknown option %s", key);
- return NULL;
- }
- src = g_try_malloc(sizeof(struct sr_config));
- src->key = srci->key;
- value = g_hash_table_lookup(hash, key);
- src->data = g_variant_new_string(value);
- opts = g_slist_append(opts, src);
- }
- g_list_free(keys);
-
- return opts;
-}
-
static void free_drvopts(struct sr_config *src)
{
g_variant_unref(src->data);
@@ -63,49 +31,22 @@ static void free_drvopts(struct sr_config *src)
GSList *device_scan(void)
{
struct sr_dev_driver **drivers, *driver;
- GHashTable *drvargs;
GSList *drvopts, *devices, *tmpdevs, *l;
int i;
- char *drvname;
if (opt_drv) {
- drvargs = parse_generic_arg(opt_drv, TRUE);
- drvname = g_strdup(g_hash_table_lookup(drvargs, "sigrok_key"));
- g_hash_table_remove(drvargs, "sigrok_key");
- driver = NULL;
- drivers = sr_driver_list();
- for (i = 0; drivers[i]; i++) {
- if (strcmp(drivers[i]->name, drvname))
- continue;
- driver = drivers[i];
- }
- if (!driver) {
- g_critical("Driver %s not found.", drvname);
- g_hash_table_destroy(drvargs);
- g_free(drvname);
- return NULL;
- }
- g_free(drvname);
- if (sr_driver_init(sr_ctx, driver) != SR_OK) {
- g_critical("Failed to initialize driver.");
- g_hash_table_destroy(drvargs);
+ /* Caller specified driver. Use it. Only this one. */
+ if (!parse_driver(opt_drv, &driver, &drvopts))
return NULL;
- }
- drvopts = NULL;
- if (g_hash_table_size(drvargs) > 0) {
- if (!(drvopts = hash_to_hwopt(drvargs))) {
- /* Unknown options, already logged. */
- g_hash_table_destroy(drvargs);
- return NULL;
- }
- }
- g_hash_table_destroy(drvargs);
devices = sr_driver_scan(driver, drvopts);
g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
+ } else if (opt_dont_scan) {
+ /* No -d choice, and -D "don't scan" requested. Do nothing. */
+ devices = NULL;
} else {
- /* No driver specified, let them all scan on their own. */
+ /* No driver specified. Scan all available drivers. */
devices = NULL;
- drivers = sr_driver_list();
+ drivers = sr_driver_list(sr_ctx);
for (i = 0; drivers[i]; i++) {
driver = drivers[i];
if (sr_driver_init(sr_ctx, driver) != SR_OK) {
@@ -122,26 +63,49 @@ GSList *device_scan(void)
return devices;
}
-struct sr_probe_group *select_probe_group(struct sr_dev_inst *sdi)
+/**
+ * Lookup a channel group from its name.
+ *
+ * Uses the caller specified channel group name, or a previously stored
+ * option value as a fallback. Returns a reference to the channel group
+ * when the lookup succeeded, or #NULL after lookup failure, as well as
+ * #NULL for the global channel group (the device).
+ *
+ * Accepts either #NULL pointer, or an empty string, or the "global"
+ * literal to address the global channel group (the device). Emits an
+ * error message when the lookup failed while a name was specified.
+ *
+ * @param[in] sdi Device instance.
+ * @param[in] cg_name Caller provided channel group name.
+ *
+ * @returns The channel group, or #NULL for failed lookup.
+ */
+struct sr_channel_group *lookup_channel_group(struct sr_dev_inst *sdi,
+ const char *cg_name)
{
- struct sr_probe_group *pg;
- GSList *l;
+ struct sr_channel_group *cg;
+ GSList *l, *channel_groups;
- if (!opt_probe_group)
+ if (!cg_name)
+ cg_name = opt_channel_group;
+ if (cg_name && g_ascii_strcasecmp(cg_name, "global") == 0)
+ cg_name = NULL;
+ if (!cg_name || !*cg_name)
return NULL;
- if (!sdi->probe_groups) {
- g_critical("This device does not have any probe groups.");
+ channel_groups = sr_dev_inst_channel_groups_get(sdi);
+ if (!channel_groups) {
+ g_critical("This device does not have any channel groups.");
return NULL;
}
- for (l = sdi->probe_groups; l; l = l->next) {
- pg = l->data;
- if (!strcasecmp(opt_probe_group, pg->name)) {
- return pg;
- }
+ for (l = channel_groups; l; l = l->next) {
+ cg = l->data;
+ if (g_ascii_strcasecmp(cg_name, cg->name) != 0)
+ continue;
+ return cg;
}
+ g_critical("Invalid channel group '%s'", cg_name);
return NULL;
}
-