X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hwplugin.c;h=a826cd9eb8ef768ea2a11ee6b56b5259781b9fef;hb=e46b8fb154ba90ffec9c1f805399dfa819e736f9;hp=c5a0b2e9852aa2cedb08b3981c3ed182e97cc62f;hpb=01cf8814949f4786da4a1be79a74030a691be152;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index c5a0b2e9..a826cd9e 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -26,9 +26,6 @@
 #include <sigrok.h>
 #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;
 
@@ -39,10 +36,13 @@ 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
@@ -58,12 +58,17 @@ extern struct device_plugin asix_sigma_plugin_info;
 #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);
@@ -81,8 +86,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)
@@ -101,9 +110,9 @@ struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
 	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;
 
@@ -163,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. */
@@ -212,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);
+
 }