X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=a159ff003c7f07f7b2669885e87fdbb44d5730b7;hb=fd65ec4c9c349a9ed240fedf69946abea7afd047;hp=48646b5933de9cce80ef752976a22b7fa3281484;hpb=f0f54487c6a146af523d6eb19fcce63422e3f0f1;p=sigrok-cli.git
diff --git a/device.c b/device.c
index 48646b5..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;
}
}