X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hwplugin.c;h=e9bd582e8455e15c571f304a84f490fddc4374ea;hb=9f8274a544865838f880c4849c28b6129141cf99;hp=aaf71b50ce94e840e8bddd5c0266ad58db5ba073;hpb=5b907f9b07b0559f7230e827e5d02589d307e727;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index aaf71b50..e9bd582e 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -24,9 +24,7 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
-
-source_callback_add source_cb_add = NULL;
-source_callback_remove source_cb_remove = NULL;
+#include "config.h"
 
 /* The list of loaded plugins lives here. */
 GSList *plugins;
@@ -37,29 +35,63 @@ GSList *plugins;
  */
 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"},
 	{0, 0, NULL, NULL},
 };
 
+#ifdef HAVE_LA_DEMO
+extern struct device_plugin demo_plugin_info;
+#endif
+#ifdef HAVE_LA_SALEAE_LOGIC
 extern struct device_plugin saleae_logic_plugin_info;
+#endif
+#ifdef HAVE_LA_OLS
 extern struct device_plugin ols_plugin_info;
+#endif
+#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
 extern struct device_plugin zeroplus_logic_cube_plugin_info;
+#endif
 #ifdef HAVE_LA_ASIX_SIGMA
 extern struct device_plugin asix_sigma_plugin_info;
 #endif
+#ifdef HAVE_LA_LINK_MSO19
+extern struct device_plugin link_mso19_plugin_info;
+#endif
+#ifdef HAVE_LA_ALSA
+extern struct 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);
+#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);
+#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)
@@ -67,33 +99,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;
 	}
@@ -102,7 +135,7 @@ 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:
@@ -139,7 +172,7 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
 
 void usb_device_instance_free(struct usb_device_instance *usb)
 {
-	/* QUICK HACK */
+	/* Avoid compiler warnings. */
 	usb = usb;
 
 	/* Nothing to do for this device instance type. */
@@ -188,15 +221,19 @@ struct hwcap_option *find_hwcap_option(int hwcap)
 	return NULL;
 }
 
+/* unnecessary level of indirection follows. */
+
 void source_remove(int fd)
 {
-	if (source_cb_remove)
-		source_cb_remove(fd);
+
+	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);
+
+	session_source_add(fd, events, timeout, rcv_cb, user_data);
+
 }