X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=device.c;h=9b68eb0b28a6db3cb34b76524ba151ac004f57a4;hb=bf43ea2317d35a3bc774a9c7e1cf6ff9b6204736;hp=b7dd710c59a32017f260e47fa17831a90ed874eb;hpb=c5d660ae244babd4afc7863ba23f66d31af6e29e;p=libsigrok.git

diff --git a/device.c b/device.c
index b7dd710c..9b68eb0b 100644
--- a/device.c
+++ b/device.c
@@ -19,10 +19,10 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
-GSList *devices = NULL;
+static GSList *devices = NULL;
 
 /**
  * Scan the system for attached logic analyzers / devices.
@@ -102,7 +102,12 @@ GSList *sr_device_list(void)
 /**
  * Create a new device.
  *
- * TODO: num_probes should be uint16_t.
+ * The device is added to the (libsigrok-internal) list of devices, but
+ * additionally a pointer to the newly created device is also returned.
+ *
+ * The device has no probes attached to it yet after this call. You can
+ * use sr_device_probe_add() to add one or more probes.
+ *
  * TODO: Should return int, so that we can return SR_OK, SR_ERR_* etc.
  *
  * It is the caller's responsibility to g_free() the allocated memory when
@@ -111,26 +116,16 @@ GSList *sr_device_list(void)
  * @param plugin TODO.
  *               If 'plugin' is NULL, the created device is a "virtual" one.
  * @param plugin_index TODO
- * @param num_probes The number of probes (>= 1) this device has.
- *                   TODO: 0 allowed?
  *
  * @return Pointer to the newly allocated device, or NULL upon errors.
  */
 struct sr_device *sr_device_new(const struct sr_device_plugin *plugin,
-				int plugin_index, int num_probes)
+				int plugin_index)
 {
 	struct sr_device *device;
-	int i;
-
-	if (!plugin) {
-		sr_err("dev: %s: plugin was NULL", __func__);
-		return NULL; /* TODO: SR_ERR_ARG */
-	}
 
 	/* TODO: Check if plugin_index valid? */
 
-	/* TODO: Check if num_probes valid? */
-
 	if (!(device = g_try_malloc0(sizeof(struct sr_device)))) {
 		sr_err("dev: %s: device malloc failed", __func__);
 		return NULL;
@@ -140,9 +135,6 @@ struct sr_device *sr_device_new(const struct sr_device_plugin *plugin,
 	device->plugin_index = plugin_index;
 	devices = g_slist_append(devices, device);
 
-	for (i = 0; i < num_probes; i++)
-		sr_device_probe_add(device, NULL); /* TODO: Check return value. */
-
 	return device;
 }
 
@@ -213,16 +205,12 @@ int sr_device_probe_clear(struct sr_device *device, int probenum)
 	}
 
 	/* If the probe has a name, remove it. */
-	if (p->name) {
-		g_free(p->name);
-		p->name = NULL;
-	}
+	g_free(p->name);
+	p->name = NULL;
 
 	/* If the probe has a trigger, remove it. */
-	if (p->trigger) {
-		g_free(p->trigger);
-		p->trigger = NULL;
-	}
+	g_free(p->trigger);
+	p->trigger = NULL;
 
 	return SR_OK;
 }
@@ -252,7 +240,6 @@ int sr_device_probe_clear(struct sr_device *device, int probenum)
 int sr_device_probe_add(struct sr_device *device, const char *name)
 {
 	struct sr_probe *p;
-	char probename[16]; /* FIXME: Don't hardcode 16? #define? */
 	int probenum;
 
 	if (!device) {
@@ -276,12 +263,7 @@ int sr_device_probe_add(struct sr_device *device, const char *name)
 
 	p->index = probenum;
 	p->enabled = TRUE;
-	if (name) {
-		p->name = g_strdup(name);
-	} else {
-		snprintf(probename, 16, "%d", probenum);
-		p->name = g_strdup(probename);
-	}
+	p->name = g_strdup(name);
 	p->trigger = NULL;
 	device->probes = g_slist_append(device->probes, p);
 
@@ -365,8 +347,7 @@ int sr_device_probe_name(struct sr_device *device, int probenum,
 	/* TODO: Sanity check on 'name'. */
 
 	/* If the probe already has a name, kill it first. */
-	if (p->name)
-		g_free(p->name);
+	g_free(p->name);
 
 	p->name = g_strdup(name);
 
@@ -401,7 +382,7 @@ int sr_device_trigger_clear(struct sr_device *device)
 	for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) {
 		p = sr_device_probe_find(device, pnum);
 		/* TODO: Silently ignore probes which cannot be found? */
-		if (p && p->trigger) {
+		if (p) {
 			g_free(p->trigger);
 			p->trigger = NULL;
 		}
@@ -447,8 +428,7 @@ int sr_device_trigger_set(struct sr_device *device, int probenum,
 	}
 
 	/* If the probe already has a trigger, kill it first. */
-	if (p->trigger)
-		g_free(p->trigger);
+	g_free(p->trigger);
 
 	p->trigger = g_strdup(trigger);