X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=e913a9afd754f88180108e00409c24e23424cd77;hb=cd009d55619181e2fa7e7112f32fe85e4b49cf14;hp=36f22016a7327d6a06b5bb9e16d3740520a5bcff;hpb=6c29007211e3a35bb90db53cd22042f04fbe4e44;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index 36f22016..e913a9af 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -24,7 +25,6 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
-#include "config.h"
 
 /* The list of loaded plugins lives here. */
 GSList *plugins;
@@ -33,10 +33,11 @@ GSList *plugins;
  * This enumerates which plugin capabilities correspond to user-settable
  * options.
  */
-struct hwcap_option hwcap_options[] = {
-	{HWCAP_SAMPLERATE, T_UINT64, "Sample rate", "samplerate"},
-	{HWCAP_CAPTURE_RATIO, T_UINT64, "Pre-trigger capture ratio", "captureratio"},
-	{HWCAP_PATTERN_MODE, T_CHAR, "Pattern generator mode", "patternmode"},
+/* 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"},
 	{0, 0, NULL, NULL},
 };
 
@@ -94,7 +95,7 @@ int load_hwplugins(void)
 	return SR_OK;
 }
 
-GSList *list_hwplugins(void)
+GSList *sr_list_hwplugins(void)
 {
 	return plugins;
 }
@@ -138,10 +139,12 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
 void sr_device_instance_free(struct sr_device_instance *sdi)
 {
 	switch (sdi->instance_type) {
-	case USB_INSTANCE:
+#ifdef HAVE_LIBUSB_1_0
+	case SR_USB_INSTANCE:
 		sr_usb_device_instance_free(sdi->usb);
 		break;
-	case SERIAL_INSTANCE:
+#endif
+	case SR_SERIAL_INSTANCE:
 		sr_serial_device_instance_free(sdi->serial);
 		break;
 	default:
@@ -155,6 +158,8 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
 	free(sdi);
 }
 
+#ifdef HAVE_LIBUSB_1_0
+
 struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
 			uint8_t address, struct libusb_device_handle *hdl)
 {
@@ -178,6 +183,8 @@ void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
 	/* Nothing to do for this device instance type. */
 }
 
+#endif
+
 struct sr_serial_device_instance *sr_serial_device_instance_new(
 						const char *port, int fd)
 {
@@ -197,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;
 
@@ -209,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;
@@ -223,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);
 }