X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=fca926f3d321e5145dc00cffd9b8db1d5bce5bbf;hp=80015f58a8291d9e2cb337aecbce386bf196967d;hb=b0b056549cdc0ee590deb941453dcf219d5123c7;hpb=1e0f9ed9b98d05dad480098668882b554dbfd1d9

diff --git a/parsers.c b/parsers.c
index 80015f5..fca926f 100644
--- a/parsers.c
+++ b/parsers.c
@@ -127,9 +127,9 @@ GHashTable *parse_generic_arg(const char *arg)
 struct sr_dev *parse_devstring(const char *devstring)
 {
 	struct sr_dev *dev, *d;
-	struct sr_dev_plugin *plugin;
-	GSList *devs, *plugins, *l, *p;
-	int num_devs, dev_num, dev_cnt;
+	struct sr_dev_driver **drivers;
+	GSList *devs, *l;
+	int i, num_devs, dev_num, dev_cnt;
 	char *tmp;
 
 	if (!devstring)
@@ -138,8 +138,8 @@ struct sr_dev *parse_devstring(const char *devstring)
 	dev = NULL;
 	dev_num = strtol(devstring, &tmp, 10);
 	if (tmp != devstring) {
-		/* argument is numeric, meaning a device ID. Make all driver
-		 * plugins scan for devices.
+		/* argument is numeric, meaning a device ID. Make all drivers
+		 * scan for devices.
 		 */
 		num_devs = num_real_devs();
 		if (dev_num < 0 || dev_num >= num_devs)
@@ -164,12 +164,11 @@ struct sr_dev *parse_devstring(const char *devstring)
 		 * no need to let them all scan
 		 */
 		dev = NULL;
-		plugins = sr_hw_list();
-		for (p = plugins; p; p = p->next) {
-			plugin = p->data;
-			if (strcmp(plugin->name, devstring))
+		drivers = sr_driver_list();
+		for (i = 0; drivers[i]; i++) {
+			if (strcmp(drivers[i]->name, devstring))
 				continue;
-			num_devs = sr_hw_init(plugin);
+			num_devs = sr_driver_init(drivers[i]);
 			if (num_devs == 1) {
 				devs = sr_dev_list();
 				dev = devs->data;