X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=33ff79d92779bbefa768541eb0f70b0ca533104f;hb=8722c31e26ecebfc75035a566d4d72d07761ef14;hp=78621c161873dcc38f63311975e6178c3013d64d;hpb=a65de0309b0629d8a5f744f4be7bad67fdd5c34e;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index 78621c16..33ff79d9 100644
--- 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,25 +102,52 @@ int load_hwplugins(void)
 	return SR_OK;
 }
 
-GSList *list_hwplugins(void)
+GSList *sr_list_hwplugins(void)
 {
 	return plugins;
 }
 
+int sr_init_hwplugins(struct sr_device_plugin *plugin)
+{
+	int num_devices, num_probes, i;
+
+	g_message("initializing %s plugin", plugin->name);
+	num_devices = plugin->init(NULL);
+	for (i = 0; i < num_devices; i++) {
+		num_probes = (int)plugin->get_device_info(i, SR_DI_NUM_PROBES);
+		sr_device_new(plugin, i, num_probes);
+	}
+
+	return num_devices;
+}
+
+void sr_cleanup_hwplugins(void)
+{
+	struct sr_device_plugin *plugin;
+	GSList *l;
+
+	for (l = plugins; l; l = l->next) {
+		plugin = l->data;
+		if (plugin->cleanup)
+			plugin->cleanup();
+	}
+
+}
+
 struct sr_device_instance *sr_device_instance_new(int index, int status,
 		const char *vendor, const char *model, const char *version)
 {
 	struct sr_device_instance *sdi;
 
-	if (!(sdi = malloc(sizeof(struct sr_device_instance))))
+	if (!(sdi = g_malloc(sizeof(struct sr_device_instance))))
 		return NULL;
 
 	sdi->index = index;
 	sdi->status = status;
 	sdi->instance_type = -1;
-	sdi->vendor = vendor ? strdup(vendor) : strdup("(unknown)");
-	sdi->model = model ? strdup(model) : NULL;
-	sdi->version = version ? strdup(version) : NULL;
+	sdi->vendor = vendor ? g_strdup(vendor) : NULL;
+	sdi->model = model ? g_strdup(model) : NULL;
+	sdi->version = version ? g_strdup(version) : NULL;
 	sdi->priv = NULL;
 	sdi->usb = NULL;
 
@@ -131,7 +165,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;
 }
@@ -152,10 +186,14 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
 		break;
 	}
 
-	free(sdi->vendor);
-	free(sdi->model);
-	free(sdi->version);
-	free(sdi);
+	if (sdi->priv)
+		g_free(sdi->priv);
+
+	g_free(sdi->vendor);
+	g_free(sdi->model);
+	g_free(sdi->version);
+	g_free(sdi);
+
 }
 
 #ifdef HAVE_LIBUSB_1_0
@@ -230,13 +268,13 @@ struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
 
 /* unnecessary level of indirection follows. */
 
-void source_remove(int fd)
+void sr_source_remove(int fd)
 {
 	sr_session_source_remove(fd);
 }
 
-void source_add(int fd, int events, int timeout, receive_data_callback rcv_cb,
-		void *user_data)
+void sr_source_add(int fd, int events, int timeout,
+		   sr_receive_data_callback rcv_cb, void *user_data)
 {
 	sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
 }