From: Bert Vermeulen <redacted>
Date: Wed, 15 Feb 2012 02:18:48 +0000 (+0100)
Subject: sr: rename all sr_hwplugin(s)_* functions to sr_hw_*
X-Git-Tag: sigrok-cli-0.3.0~29
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=fa7827c587a00a6aebc736bee34380abc7efc525;p=sigrok-cli.git

sr: rename all sr_hwplugin(s)_* functions to sr_hw_*
---

diff --git a/parsers.c b/parsers.c
index f3321ba..4430b90 100644
--- a/parsers.c
+++ b/parsers.c
@@ -164,12 +164,12 @@ struct sr_device *parse_devicestring(const char *devicestring)
 		 * no need to let them all scan
 		 */
 		device = NULL;
-		plugins = sr_hwplugins_list();
+		plugins = sr_hw_list();
 		for (p = plugins; p; p = p->next) {
 			plugin = p->data;
 			if (strcmp(plugin->name, devicestring))
 				continue;
-			num_devices = sr_hwplugin_init(plugin);
+			num_devices = sr_hw_init(plugin);
 			if (num_devices == 1) {
 				devices = sr_dev_list();
 				device = devices->data;
diff --git a/sigrok-cli.c b/sigrok-cli.c
index dda4343..8c92d9f 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");
-	plugins = sr_hwplugins_list();
+	plugins = sr_hw_list();
 	for (p = plugins; p; p = p->next) {
 		plugin = p->data;
 		printf("  %-20s %s\n", plugin->name, plugin->longname);
@@ -203,7 +203,7 @@ static void show_device_detail(void)
 	title = "Supported options:\n";
 	capabilities = device->plugin->get_capabilities();
 	for (cap = 0; capabilities[cap]; cap++) {
-		if (!(hwo = sr_hwplugins_hwcap_get(capabilities[cap])))
+		if (!(hwo = sr_hw_hwcap_get(capabilities[cap])))
 			continue;
 
 		if (title) {
@@ -837,7 +837,7 @@ static void run_session(void)
             return;
 
 	if (opt_continuous) {
-		if (!sr_hwplugin_has_hwcap(device->plugin, SR_HWCAP_CONTINUOUS)) {
+		if (!sr_hw_has_hwcap(device->plugin, SR_HWCAP_CONTINUOUS)) {
 			printf("This device does not support continuous sampling.");
 			sr_session_destroy();
 			return;
@@ -869,7 +869,7 @@ static void run_session(void)
 			return;
 		}
 
-		if (sr_hwplugin_has_hwcap(device->plugin, SR_HWCAP_LIMIT_MSEC)) {
+		if (sr_hw_has_hwcap(device->plugin, SR_HWCAP_LIMIT_MSEC)) {
 			if (device->plugin->set_configuration(device->plugin_index,
 							  SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
 				printf("Failed to configure time limit.\n");