X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=device.c;h=a159ff003c7f07f7b2669885e87fdbb44d5730b7;hp=2a5d14a2a7267138498c1d1942e23fb2de02a0ec;hb=9054d075f459c094eef7e5b5629870610df06cd9;hpb=c6fa2b2e53d04462bd9fd0033b99e9165323762a
diff --git a/device.c b/device.c
index 2a5d14a..a159ff0 100644
--- a/device.c
+++ b/device.c
@@ -17,12 +17,10 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
-#include "config.h"
+#include
#include
#include
-
-extern struct sr_context *sr_ctx;
+#include "sigrok-cli.h"
static void free_drvopts(struct sr_config *src)
{
@@ -44,7 +42,7 @@ GSList *device_scan(void)
} else {
/* No driver specified, let them all scan on their own. */
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 +76,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;
}
}
@@ -86,4 +84,3 @@ struct sr_channel_group *select_channel_group(struct sr_dev_inst *sdi)
return NULL;
}
-