X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=e913a9afd754f88180108e00409c24e23424cd77;hb=d078d2e5f3842b1915ffa9961654f3aa4ed88e17;hp=31fed10c8583fe77e255c8f38f2813477ca61112;hpb=5a2326a71b3a7d3bc6b367a7a3dfa6f137f5f0ec;p=libsigrok.git
diff --git a/hwplugin.c b/hwplugin.c
index 31fed10c..e913a9af 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include "config.h"
#include
#include
#include
@@ -24,7 +25,6 @@
#include
#include
#include
-#include "config.h"
/* The list of loaded plugins lives here. */
GSList *plugins;
@@ -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;
}
@@ -138,9 +139,11 @@ 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) {
+#ifdef HAVE_LIBUSB_1_0
case SR_USB_INSTANCE:
sr_usb_device_instance_free(sdi->usb);
break;
+#endif
case SR_SERIAL_INSTANCE:
sr_serial_device_instance_free(sdi->serial);
break;
@@ -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);
}