X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=2ed6094bd42825165fa7d0cabb552dda428192b9;hb=8a7b47cdfae4a4a95e92958beab41a4985e8f8e3;hp=db0e72f135a9b3f4cba2b5db2fc55d091bef3bd8;hpb=1ebdb3fdc3e28d138046539d9a38610254d9c00a;p=libsigrok.git
diff --git a/hwplugin.c b/hwplugin.c
index db0e72f1..2ed6094b 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include "config.h"
#include
#include
#include
@@ -25,9 +26,6 @@
#include
#include
-source_callback_add source_cb_add = NULL;
-source_callback_remove source_cb_remove = NULL;
-
/* The list of loaded plugins lives here. */
GSList *plugins;
@@ -35,62 +33,101 @@ GSList *plugins;
* This enumerates which plugin capabilities correspond to user-settable
* options.
*/
-struct hwcap_option hwcap_options[] = {
- {HWCAP_SAMPLERATE, T_UINT64, "Sample rate", "samplerate"},
- {0, 0, NULL, NULL}
+/* 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},
};
-extern struct device_plugin saleae_logic_plugin_info;
-extern struct device_plugin ols_plugin_info;
-extern struct device_plugin zeroplus_logic_cube_plugin_info;
-extern struct device_plugin asix_sigma_plugin_info;
-
+#ifdef HAVE_LA_DEMO
+extern struct sr_device_plugin demo_plugin_info;
+#endif
+#ifdef HAVE_LA_SALEAE_LOGIC
+extern struct sr_device_plugin saleae_logic_plugin_info;
+#endif
+#ifdef HAVE_LA_OLS
+extern struct sr_device_plugin ols_plugin_info;
+#endif
+#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
+extern struct sr_device_plugin zeroplus_logic_cube_plugin_info;
+#endif
+#ifdef HAVE_LA_ASIX_SIGMA
+extern struct sr_device_plugin asix_sigma_plugin_info;
+#endif
+#ifdef HAVE_LA_LINK_MSO19
+extern struct sr_device_plugin link_mso19_plugin_info;
+#endif
+#ifdef HAVE_LA_ALSA
+extern struct sr_device_plugin alsa_plugin_info;
+#endif
+
+
+/* TODO: No linked list needed, this can be a simple array. */
int load_hwplugins(void)
{
+#ifdef HAVE_LA_DEMO
+ plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info);
+#endif
+#ifdef HAVE_LA_SALEAE_LOGIC
plugins =
- g_slist_append(plugins, (gpointer *) &saleae_logic_plugin_info);
- plugins = g_slist_append(plugins, (gpointer *) &ols_plugin_info);
+ g_slist_append(plugins, (gpointer *)&saleae_logic_plugin_info);
+#endif
+#ifdef HAVE_LA_OLS
+ plugins = g_slist_append(plugins, (gpointer *)&ols_plugin_info);
+#endif
+#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
plugins = g_slist_append(plugins,
- (gpointer *) &zeroplus_logic_cube_plugin_info);
+ (gpointer *)&zeroplus_logic_cube_plugin_info);
+#endif
+#ifdef HAVE_LA_ASIX_SIGMA
plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info);
+#endif
+#ifdef HAVE_LA_LINK_MSO19
+ plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info);
+#endif
+#ifdef HAVE_LA_ALSA
+ plugins = g_slist_append(plugins, (gpointer *)&alsa_plugin_info);
+#endif
+
- return SIGROK_OK;
+ return SR_OK;
}
-GSList *list_hwplugins(void)
+GSList *sr_list_hwplugins(void)
{
return plugins;
}
-struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
- char *vendor, char *model, char *version)
+struct sr_device_instance *sr_device_instance_new(int index, int status,
+ const char *vendor, const char *model, const char *version)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
- sdi = malloc(sizeof(struct sigrok_device_instance));
- if (!sdi)
+ if (!(sdi = malloc(sizeof(struct sr_device_instance))))
return NULL;
sdi->index = index;
sdi->status = status;
sdi->instance_type = -1;
- sdi->vendor = strdup(vendor);
- sdi->model = strdup(model);
- sdi->version = strdup(version);
+ sdi->vendor = vendor ? strdup(vendor) : NULL;
+ sdi->model = model ? strdup(model) : strdup("(unknown)");
+ sdi->version = version ? strdup(version) : NULL;
+ sdi->priv = NULL;
sdi->usb = NULL;
return sdi;
}
-struct sigrok_device_instance *get_sigrok_device_instance(
- GSList *device_instances, int device_index)
+struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
+ int device_index)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
GSList *l;
- sdi = NULL;
for (l = device_instances; l; l = l->next) {
- sdi = (struct sigrok_device_instance *)(l->data);
+ sdi = (struct sr_device_instance *)(l->data);
if (sdi->index == device_index)
return sdi;
}
@@ -99,16 +136,20 @@ struct sigrok_device_instance *get_sigrok_device_instance(
return NULL;
}
-void sigrok_device_instance_free(struct sigrok_device_instance *sdi)
+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. */
+ break;
}
free(sdi->vendor);
@@ -117,36 +158,39 @@ void sigrok_device_instance_free(struct sigrok_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;
- udi = malloc(sizeof(struct usb_device_instance));
- if (!udi)
+ if (!(udi = malloc(sizeof(struct sr_usb_device_instance))))
return NULL;
udi->bus = bus;
udi->address = address;
- udi->devhdl = hdl;
+ udi->devhdl = hdl; /* TODO: Check if this is NULL? */
return udi;
}
-void usb_device_instance_free(struct usb_device_instance *usb)
+void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
{
- /* QUICK HACK */
+ /* Avoid compiler warnings. */
usb = usb;
/* Nothing to do for this device instance type. */
}
-struct serial_device_instance *serial_device_instance_new(char *port, int fd)
+#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;
- serial = malloc(sizeof(struct serial_device_instance));
- if (!serial)
+ if (!(serial = malloc(sizeof(struct sr_serial_device_instance))))
return NULL;
serial->port = strdup(port);
@@ -155,47 +199,44 @@ struct serial_device_instance *serial_device_instance_new(char *port, int fd)
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;
- for (i = 0; capabilities[i]; i++)
+ for (i = 0; capabilities[i]; i++) {
if (capabilities[i] == hwcap)
return TRUE;
+ }
return FALSE;
}
-struct hwcap_option *find_hwcap_option(int hwcap)
+struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
{
- struct hwcap_option *hwo;
int i;
- hwo = NULL;
- for (i = 0; hwcap_options[i].capability; i++) {
- if (hwcap_options[i].capability == hwcap) {
- hwo = &hwcap_options[i];
- break;
- }
+ for (i = 0; sr_hwcap_options[i].capability; i++) {
+ if (sr_hwcap_options[i].capability == hwcap)
+ return &sr_hwcap_options[i];
}
- return hwo;
+ return NULL;
}
-void source_remove(int fd)
+/* unnecessary level of indirection follows. */
+
+void sr_source_remove(int fd)
{
- if (source_cb_remove)
- source_cb_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)
{
- if (source_cb_add)
- source_cb_add(fd, events, timeout, rcv_cb, user_data);
+ sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
}