X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=6921ceb0fad60243a8eae13e06adfc2434af4167;hb=6d754b6d3a8f843cd5254617674f484cac9b12db;hp=0cc5e55256978230eb565aa879ad22b74d31ff2e;hpb=b53738baf76219237e0a6629905981d7a1f2508e;p=libsigrok.git

diff --git a/device.c b/device.c
index 0cc5e552..6921ceb0 100644
--- a/device.c
+++ b/device.c
@@ -26,6 +26,7 @@ extern struct sr_global *global;
 
 GSList *devices = NULL;
 
+
 void sr_device_scan(void)
 {
 	GSList *plugins, *l;
@@ -40,35 +41,9 @@ void sr_device_scan(void)
 	 */
 	for (l = plugins; l; l = l->next) {
 		plugin = l->data;
-		sr_device_plugin_init(plugin);
-	}
-
-}
-
-int sr_device_plugin_init(struct sr_device_plugin *plugin)
-{
-	int num_devices, num_probes, i;
-
-	sr_info("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);
+		sr_init_hwplugins(plugin);
 	}
 
-	return num_devices;
-}
-
-void sr_device_close_all(void)
-{
-	struct sr_device *device;
-
-	while (devices) {
-		device = devices->data;
-		if (device->plugin && device->plugin->close)
-			device->plugin->close(device->plugin_index);
-		sr_device_destroy(device);
-	}
 }
 
 GSList *sr_device_list(void)
@@ -105,8 +80,6 @@ void sr_device_clear(struct sr_device *device)
 {
 	unsigned int pnum;
 
-	/* TODO: Plugin-specific clear call? */
-
 	if (!device->probes)
 		return;
 
@@ -114,24 +87,6 @@ void sr_device_clear(struct sr_device *device)
 		sr_device_probe_clear(device, pnum);
 }
 
-void sr_device_destroy(struct sr_device *device)
-{
-	unsigned int pnum;
-
-	/*
-	 * TODO: Plugin-specific destroy call, need to decrease refcount
-	 * in plugin.
-	 */
-
-	devices = g_slist_remove(devices, device);
-	if (device->probes) {
-		for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++)
-			sr_device_probe_clear(device, pnum);
-		g_slist_free(device->probes);
-	}
-	g_free(device);
-}
-
 void sr_device_probe_clear(struct sr_device *device, int probenum)
 {
 	struct sr_probe *p;
@@ -194,7 +149,7 @@ struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum)
 	return found_probe;
 }
 
-/* TODO: return SIGROK_ERR if probenum not found */
+/* TODO: return SR_ERR if probenum not found */
 void sr_device_probe_name(struct sr_device *device, int probenum,
 			  const char *name)
 {
@@ -209,7 +164,7 @@ void sr_device_probe_name(struct sr_device *device, int probenum,
 	p->name = g_strdup(name);
 }
 
-/* TODO: return SIGROK_ERR if probenum not found */
+/* TODO: return SR_ERR if probenum not found */
 void sr_device_trigger_clear(struct sr_device *device)
 {
 	struct sr_probe *p;
@@ -227,7 +182,7 @@ void sr_device_trigger_clear(struct sr_device *device)
 	}
 }
 
-/* TODO: return SIGROK_ERR if probenum not found */
+/* TODO: return SR_ERR if probenum not found */
 void sr_device_trigger_set(struct sr_device *device, int probenum,
 			   const char *trigger)
 {