X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=device.c;h=19192ecbb0b69b404529df45d374be955d1962c9;hp=17505e26a59e60a44b7b7e50f3db8f3630499759;hb=56fc0d6dbca2d46ff2a79275ef6307c4e38bf6a1;hpb=662a1e27fa9573a35a6f9a6f699dee2be447826a

diff --git a/device.c b/device.c
index 17505e2..19192ec 100644
--- a/device.c
+++ b/device.c
@@ -17,12 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <string.h>
 #include "sigrok-cli.h"
-#include "config.h"
-
-extern struct sr_context *sr_ctx;
 
 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) {
@@ -78,7 +80,7 @@ struct sr_channel_group *select_channel_group(struct sr_dev_inst *sdi)
 
 	for (l = channel_groups; l; l = l->next) {
 		cg = l->data;
-		if (!strcasecmp(opt_channel_group, cg->name)) {
+		if (!g_ascii_strcasecmp(opt_channel_group, cg->name)) {
 			return cg;
 		}
 	}