X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=device.c;h=2d63cab419c626234b437d81e43ede64f2188f5c;hp=ea4d073bf98cfd08156176d77b64cf72fa146ca3;hb=ee639fb40fa43aa3553ef0229def9bcdb8338c2b;hpb=d75c85291a61a6d83386de95cff6ad279e853ebd

diff --git a/device.c b/device.c
index ea4d073..2d63cab 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 <glib.h>
 #include <string.h>
-
-extern struct sr_context *sr_ctx;
+#include "sigrok-cli.h"
+#include "config.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) {
@@ -64,17 +62,19 @@ GSList *device_scan(void)
 struct sr_channel_group *select_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;
@@ -84,4 +84,3 @@ struct sr_channel_group *select_channel_group(struct sr_dev_inst *sdi)
 
 	return NULL;
 }
-