From: Uwe Hermann <redacted>
Date: Wed, 29 Feb 2012 18:56:15 +0000 (+0100)
Subject: sr/cli/gtk/qt: s/hw/driver/ in some places.
X-Git-Tag: sigrok-cli-0.3.0~17
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a214a2eb2f86976d44b0e0689efad26cecf529f6;p=sigrok-cli.git

sr/cli/gtk/qt: s/hw/driver/ in some places.
---

diff --git a/parsers.c b/parsers.c
index 47f11a0..fca926f 100644
--- a/parsers.c
+++ b/parsers.c
@@ -164,11 +164,11 @@ struct sr_dev *parse_devstring(const char *devstring)
 		 * no need to let them all scan
 		 */
 		dev = NULL;
-		drivers = sr_hw_list();
+		drivers = sr_driver_list();
 		for (i = 0; drivers[i]; i++) {
 			if (strcmp(drivers[i]->name, devstring))
 				continue;
-			num_devs = sr_hw_init(drivers[i]);
+			num_devs = sr_driver_init(drivers[i]);
 			if (num_devs == 1) {
 				devs = sr_dev_list();
 				dev = devs->data;
diff --git a/sigrok-cli.c b/sigrok-cli.c
index 4bd2de4..461899e 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -95,7 +95,7 @@ static void show_version(void)
 	printf("sigrok-cli %s\n\n", VERSION);
 
 	printf("Supported hardware drivers:\n");
-	drivers = sr_hw_list();
+	drivers = sr_driver_list();
 	for (i = 0; drivers[i]; i++) {
 		printf("  %-20s %s\n", drivers[i]->name, drivers[i]->longname);
 	}
@@ -836,7 +836,7 @@ static void run_session(void)
             return;
 
 	if (opt_continuous) {
-		if (!sr_hw_has_hwcap(dev->driver, SR_HWCAP_CONTINUOUS)) {
+		if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
 			printf("This device does not support continuous sampling.");
 			sr_session_destroy();
 			return;
@@ -868,7 +868,7 @@ static void run_session(void)
 			return;
 		}
 
-		if (sr_hw_has_hwcap(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
+		if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
 			if (dev->driver->dev_config_set(dev->driver_index,
 			    SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
 				printf("Failed to configure time limit.\n");