X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hwplugin.c;h=1ba4dbb0a623afc78fff2166130331bdd7790984;hb=c2bd92ec0867eff49ee58b557d6fb9aec2b63357;hp=1fd9521473336ca900240ebd1086ceade71d57e7;hpb=3245dfcb629ced90a2570dc04db99f59af60b888;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index 1fd95214..1ba4dbb0 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -39,9 +39,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
@@ -54,10 +58,17 @@ extern struct device_plugin zeroplus_logic_cube_plugin_info;
 #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)
 {
+#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);
@@ -72,6 +83,9 @@ int load_hwplugins(void)
 #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;
 }
@@ -92,9 +106,10 @@ 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;
 
 	return sdi;
@@ -153,7 +168,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. */