X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=e913a9afd754f88180108e00409c24e23424cd77;hb=809c5f2011198a064a2e5e4028f19e63eb532ec1;hp=5590a4bbb5b9a0d8e0b93d9f4583d7ca236f5cb2;hpb=a00ba012288726678e1a270961c8d4f46f3dbd33;p=libsigrok.git
diff --git a/hwplugin.c b/hwplugin.c
index 5590a4bb..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,33 +33,34 @@ 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},
};
#ifdef HAVE_LA_DEMO
-extern struct device_plugin demo_plugin_info;
+extern struct sr_device_plugin demo_plugin_info;
#endif
#ifdef HAVE_LA_SALEAE_LOGIC
-extern struct device_plugin saleae_logic_plugin_info;
+extern struct sr_device_plugin saleae_logic_plugin_info;
#endif
#ifdef HAVE_LA_OLS
-extern struct device_plugin ols_plugin_info;
+extern struct sr_device_plugin ols_plugin_info;
#endif
#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
-extern struct device_plugin zeroplus_logic_cube_plugin_info;
+extern struct sr_device_plugin zeroplus_logic_cube_plugin_info;
#endif
#ifdef HAVE_LA_ASIX_SIGMA
-extern struct device_plugin asix_sigma_plugin_info;
+extern struct sr_device_plugin asix_sigma_plugin_info;
#endif
#ifdef HAVE_LA_LINK_MSO19
-extern struct device_plugin link_mso19_plugin_info;
+extern struct sr_device_plugin link_mso19_plugin_info;
#endif
#ifdef HAVE_LA_ALSA
-extern struct device_plugin alsa_plugin_info;
+extern struct sr_device_plugin alsa_plugin_info;
#endif
@@ -94,7 +95,7 @@ int load_hwplugins(void)
return SR_OK;
}
-GSList *list_hwplugins(void)
+GSList *sr_list_hwplugins(void)
{
return plugins;
}
@@ -119,8 +120,8 @@ struct sr_device_instance *sr_device_instance_new(int index, int status,
return sdi;
}
-struct sr_device_instance *get_sr_device_instance(
- GSList *device_instances, int device_index)
+struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
+ int device_index)
{
struct sr_device_instance *sdi;
GSList *l;
@@ -138,11 +139,13 @@ struct sr_device_instance *get_sr_device_instance(
void sr_device_instance_free(struct sr_device_instance *sdi)
{
switch (sdi->instance_type) {
- case USB_INSTANCE:
- usb_device_instance_free(sdi->usb);
+#ifdef HAVE_LIBUSB_1_0
+ case SR_USB_INSTANCE:
+ sr_usb_device_instance_free(sdi->usb);
break;
- case SERIAL_INSTANCE:
- serial_device_instance_free(sdi->serial);
+#endif
+ case SR_SERIAL_INSTANCE:
+ sr_serial_device_instance_free(sdi->serial);
break;
default:
/* No specific type, nothing extra to free. */
@@ -155,12 +158,14 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
free(sdi);
}
-struct usb_device_instance *usb_device_instance_new(uint8_t bus,
+#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)
{
- struct usb_device_instance *udi;
+ struct sr_usb_device_instance *udi;
- if (!(udi = malloc(sizeof(struct usb_device_instance))))
+ if (!(udi = malloc(sizeof(struct sr_usb_device_instance))))
return NULL;
udi->bus = bus;
@@ -170,7 +175,7 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
return udi;
}
-void usb_device_instance_free(struct usb_device_instance *usb)
+void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
{
/* Avoid compiler warnings. */
usb = usb;
@@ -178,12 +183,14 @@ void usb_device_instance_free(struct usb_device_instance *usb)
/* Nothing to do for this device instance type. */
}
-struct serial_device_instance *serial_device_instance_new(
+#endif
+
+struct sr_serial_device_instance *sr_serial_device_instance_new(
const char *port, int fd)
{
- struct serial_device_instance *serial;
+ struct sr_serial_device_instance *serial;
- if (!(serial = malloc(sizeof(struct serial_device_instance))))
+ if (!(serial = malloc(sizeof(struct sr_serial_device_instance))))
return NULL;
serial->port = strdup(port);
@@ -192,12 +199,12 @@ struct serial_device_instance *serial_device_instance_new(
return serial;
}
-void serial_device_instance_free(struct serial_device_instance *serial)
+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);
}