ASIX: Small consistency fixes.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index 554dc5df2b05e549c089c35a848e70ac4c013116..412cf2d68ab5b34e22f70a36543b61d75afd13a6 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 /* The list of loaded plugins lives here. */
 GSList *plugins;
@@ -56,6 +57,9 @@ extern struct sr_device_plugin zeroplus_logic_cube_plugin_info;
 #ifdef HAVE_LA_ASIX_SIGMA
 extern struct sr_device_plugin asix_sigma_plugin_info;
 #endif
+#ifdef HAVE_LA_CHRONOVU_LA8
+extern struct device_plugin chronovu_la8_plugin_info;
+#endif
 #ifdef HAVE_LA_LINK_MSO19
 extern struct sr_device_plugin link_mso19_plugin_info;
 #endif
@@ -84,6 +88,9 @@ int load_hwplugins(void)
 #ifdef HAVE_LA_ASIX_SIGMA
        plugins = g_slist_append(plugins, (gpointer *)&asix_sigma_plugin_info);
 #endif
+#ifdef HAVE_LA_CHRONOVU_LA8
+       plugins = g_slist_append(plugins, (gpointer *)&chronovu_la8_plugin_info);
+#endif
 #ifdef HAVE_LA_LINK_MSO19
        plugins = g_slist_append(plugins, (gpointer *)&link_mso19_plugin_info);
 #endif
@@ -95,7 +102,7 @@ int load_hwplugins(void)
        return SR_OK;
 }
 
-GSList *list_hwplugins(void)
+GSList *sr_list_hwplugins(void)
 {
        return plugins;
 }
@@ -111,8 +118,8 @@ struct sr_device_instance *sr_device_instance_new(int index, int status,
        sdi->index = index;
        sdi->status = status;
        sdi->instance_type = -1;
-       sdi->vendor = vendor ? strdup(vendor) : strdup("(unknown)");
-       sdi->model = model ? strdup(model) : NULL;
+       sdi->vendor = vendor ? strdup(vendor) : NULL;
+       sdi->model = model ? strdup(model) : strdup("(unknown)");
        sdi->version = version ? strdup(version) : NULL;
        sdi->priv = NULL;
        sdi->usb = NULL;
@@ -131,7 +138,7 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
                if (sdi->index == device_index)
                        return sdi;
        }
-       g_warning("could not find device index %d instance", device_index);
+       sr_warn("could not find device index %d instance", device_index);
 
        return NULL;
 }
@@ -236,7 +243,7 @@ void sr_source_remove(int fd)
 }
 
 void sr_source_add(int fd, int events, int timeout,
-                  receive_data_callback rcv_cb, void *user_data)
+                  sr_receive_data_callback rcv_cb, void *user_data)
 {
        sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
 }