From: Uwe Hermann <redacted>
Date: Tue, 15 Feb 2011 18:24:52 +0000 (+0100)
Subject: Add sr_ prefix for hwcap structs/functions.
X-Git-Tag: libsigrok-0.1.0~328
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a65de0309b0629d8a5f744f4be7bad67fdd5c34e;p=libsigrok.git

Add sr_ prefix for hwcap structs/functions.
---

diff --git a/hwplugin.c b/hwplugin.c
index 046670d5..78621c16 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -33,7 +33,8 @@ GSList *plugins;
  * This enumerates which plugin capabilities correspond to user-settable
  * options.
  */
-struct hwcap_option hwcap_options[] = {
+/* TODO: This shouldn't be a global. */
+struct sr_hwcap_option sr_hwcap_options[] = {
 	{SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
 	{SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
 	{SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
@@ -203,7 +204,7 @@ void sr_serial_device_instance_free(struct sr_serial_device_instance *serial)
 	free(serial->port);
 }
 
-int find_hwcap(int *capabilities, int hwcap)
+int sr_find_hwcap(int *capabilities, int hwcap)
 {
 	int i;
 
@@ -215,13 +216,13 @@ int find_hwcap(int *capabilities, int hwcap)
 	return FALSE;
 }
 
-struct hwcap_option *find_hwcap_option(int hwcap)
+struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
 {
 	int i;
 
-	for (i = 0; hwcap_options[i].capability; i++) {
-		if (hwcap_options[i].capability == hwcap)
-			return &hwcap_options[i];
+	for (i = 0; sr_hwcap_options[i].capability; i++) {
+		if (sr_hwcap_options[i].capability == hwcap)
+			return &sr_hwcap_options[i];
 	}
 
 	return NULL;
diff --git a/sigrok-proto.h b/sigrok-proto.h
index 4d6a68f4..7b337d48 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -83,8 +83,8 @@ struct sr_serial_device_instance *sr_serial_device_instance_new(
 					const char *port, int fd);
 void sr_serial_device_instance_free(struct sr_serial_device_instance *serial);
 
-int find_hwcap(int *capabilities, int hwcap);
-struct hwcap_option *find_hwcap_option(int hwcap);
+int sr_find_hwcap(int *capabilities, int hwcap);
+struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);
 void source_remove(int fd);
 void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb,
 		void *user_data);
diff --git a/sigrok.h b/sigrok.h
index 414890df..e2bbecc5 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -237,7 +237,7 @@ enum {
 	SR_HWCAP_CONTINUOUS,
 };
 
-struct hwcap_option {
+struct sr_hwcap_option {
 	int capability;
 	int type;
 	char *description;