X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=e913a9afd754f88180108e00409c24e23424cd77;hb=120b259ea8f17b74deca3ba4b71e78771539bde8;hp=b10164693f52adec61d8a8f457587c255055d0d1;hpb=22b02383442ec55a11cc6dd2b4c467d1de0b5bd2;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index b1016469..e913a9af 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"},
@@ -94,7 +95,7 @@ int load_hwplugins(void)
 	return SR_OK;
 }
 
-GSList *list_hwplugins(void)
+GSList *sr_list_hwplugins(void)
 {
 	return plugins;
 }
@@ -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;
@@ -229,17 +230,13 @@ struct hwcap_option *find_hwcap_option(int hwcap)
 
 /* unnecessary level of indirection follows. */
 
-void source_remove(int fd)
+void sr_source_remove(int fd)
 {
-
-	session_source_remove(fd);
-
+	sr_session_source_remove(fd);
 }
 
-void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb,
-		void *user_data)
+void sr_source_add(int fd, int events, int timeout,
+		   sr_receive_data_callback rcv_cb, void *user_data)
 {
-
-	session_source_add(fd, events, timeout, rcv_cb, user_data);
-
+	sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
 }