X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=c5a0b2e9852aa2cedb08b3981c3ed182e97cc62f;hb=1fdb75e14528abd62ebe727537512c741a5759da;hp=5cd6f6bb6f87086e1fcb673cf5176881b73a264d;hpb=49d0ce50d0e43c1a10dc2863afd20185051819aa;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index 5cd6f6bb..c5a0b2e9 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include "config.h"
 
 source_callback_add source_cb_add = NULL;
 source_callback_remove source_cb_remove = NULL;
@@ -37,23 +38,49 @@ GSList *plugins;
  */
 struct hwcap_option hwcap_options[] = {
 	{HWCAP_SAMPLERATE, T_UINT64, "Sample rate", "samplerate"},
+	{HWCAP_CAPTURE_RATIO, T_UINT64, "Pre-trigger capture ratio", "captureratio"},
 	{0, 0, NULL, NULL},
 };
 
+extern struct device_plugin demo_plugin_info;
+#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
+
 
 /* TODO: No linked list needed, this can be a simple array. */
 int load_hwplugins(void)
 {
+	plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info);
+#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
 
 	return SIGROK_OK;
 }
@@ -77,6 +104,7 @@ struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
 	sdi->vendor = strdup(vendor);
 	sdi->model = strdup(model);
 	sdi->version = strdup(version);
+	sdi->priv = NULL;
 	sdi->usb = NULL;
 
 	return sdi;