X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hwplugin.c;h=78621c161873dcc38f63311975e6178c3013d64d;hb=a65de0309b0629d8a5f744f4be7bad67fdd5c34e;hp=c5a0b2e9852aa2cedb08b3981c3ed182e97cc62f;hpb=01cf8814949f4786da4a1be79a74030a691be152;p=libsigrok.git
diff --git a/hwplugin.c b/hwplugin.c
index c5a0b2e9..78621c16 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,10 +25,6 @@
#include
#include
#include
-#include "config.h"
-
-source_callback_add source_cb_add = NULL;
-source_callback_remove source_cb_remove = NULL;
/* The list of loaded plugins lives here. */
GSList *plugins;
@@ -36,34 +33,43 @@ 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"},
+/* 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 demo_plugin_info;
+#ifdef HAVE_LA_DEMO
+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 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);
@@ -81,8 +87,12 @@ int load_hwplugins(void)
#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)
@@ -90,34 +100,34 @@ GSList *list_hwplugins(void)
return plugins;
}
-struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
+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;
- if (!(sdi = malloc(sizeof(struct sigrok_device_instance))))
+ 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) : strdup("(unknown)");
+ sdi->model = model ? strdup(model) : NULL;
+ 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;
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;
}
@@ -126,14 +136,16 @@ 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. */
@@ -146,12 +158,14 @@ 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;
- if (!(udi = malloc(sizeof(struct usb_device_instance))))
+ if (!(udi = malloc(sizeof(struct sr_usb_device_instance))))
return NULL;
udi->bus = bus;
@@ -161,20 +175,22 @@ 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)
{
- /* QUICK HACK */
+ /* Avoid compiler warnings. */
usb = 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);
@@ -183,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;
@@ -200,27 +216,27 @@ 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;
}
+/* unnecessary level of indirection follows. */
+
void 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)
{
- 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);
}