Whitespace and consistency fixes.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index 1fd9521473336ca900240ebd1086ceade71d57e7..bbecaef12270daa4553f84c0477facb5cb5758cb 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -42,6 +42,9 @@ struct hwcap_option hwcap_options[] = {
        {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 +57,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 +82,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;
 }
@@ -95,6 +108,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;
@@ -153,7 +167,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. */