X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=141e3cfd2c9edb35887c02a0a2ff3acb891c4f2c;hb=cad0cba6bb76d7aab6304aef41a2dd304ddad974;hp=ea4d073bf98cfd08156176d77b64cf72fa146ca3;hpb=d75c85291a61a6d83386de95cff6ad279e853ebd;p=sigrok-cli.git

diff --git a/device.c b/device.c
index ea4d073..141e3cf 100644
--- a/device.c
+++ b/device.c
@@ -17,12 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
+#include <config.h>
 #include <glib.h>
 #include <string.h>
-
-extern struct sr_context *sr_ctx;
+#include "sigrok-cli.h"
 
 static void free_drvopts(struct sr_config *src)
 {
@@ -37,14 +35,18 @@ GSList *device_scan(void)
 	int i;
 
 	if (opt_drv) {
+		/* Caller specified driver. Use it. Only this one. */
 		if (!parse_driver(opt_drv, &driver, &drvopts))
 			return NULL;
 		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) {
@@ -61,27 +63,40 @@ GSList *device_scan(void)
 	return devices;
 }
 
-struct sr_channel_group *select_channel_group(struct sr_dev_inst *sdi)
+/**
+ * Lookup a channel group from its name.
+ *
+ * Uses the previously stored option value to lookup a channel group.
+ * Returns a reference to the channel group when the lookup succeeded,
+ * or #NULL after lookup failure, or #NULL for the global channel group
+ * (the device's global parameters). Emits an error message when the
+ * lookup failed while a channel group's name was specified.
+ *
+ * @param[in] sdi Device instance.
+ *
+ * @returns The channel group, or #NULL for failed lookup.
+ */
+struct sr_channel_group *lookup_channel_group(struct sr_dev_inst *sdi)
 {
 	struct sr_channel_group *cg;
-	GSList *l;
+	GSList *l, *channel_groups;
 
 	if (!opt_channel_group)
 		return NULL;
 
-	if (!sdi->channel_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->channel_groups; l; l = l->next) {
+	for (l = channel_groups; l; l = l->next) {
 		cg = l->data;
-		if (!strcasecmp(opt_channel_group, cg->name)) {
-			return cg;
-		}
+		if (g_ascii_strcasecmp(opt_channel_group, cg->name) != 0)
+			continue;
+		return cg;
 	}
 	g_critical("Invalid channel group '%s'", opt_channel_group);
 
 	return NULL;
 }
-