X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=72cba33873fba72fe74a112df3d05ec4aebfad99;hb=3b7c8f54fcf4c6de1ec67d11a9ec8975a2ddbb57;hp=c29bc43ed746004d270ba12926c8519616d81f76;hpb=0e3b143994797cd4685526b9a739089fe83385cf;p=libsigrok.git

diff --git a/device.c b/device.c
index c29bc43e..72cba338 100644
--- a/device.c
+++ b/device.c
@@ -19,12 +19,10 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
-extern struct sr_global *global;
-
-GSList *devices = NULL;
+static GSList *devices = NULL;
 
 /**
  * Scan the system for attached logic analyzers / devices.
@@ -104,8 +102,12 @@ GSList *sr_device_list(void)
 /**
  * Create a new device.
  *
- * TODO: 'plugin' can be const.
- * 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
@@ -114,38 +116,25 @@ 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(struct sr_device_plugin *plugin, int plugin_index,
-			        int num_probes)
+struct sr_device *sr_device_new(const struct sr_device_plugin *plugin,
+				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;
 	}
 
-	device->plugin = plugin;
+	device->plugin = (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;
 }
 
@@ -255,7 +244,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) {
@@ -279,12 +267,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);
 
@@ -301,13 +284,13 @@ int sr_device_probe_add(struct sr_device *device, const char *name)
  *                 Note that the probe numbers start at 1 (not 0!).
  *
  * TODO: Should return int.
- * TODO: device can be const.
  * TODO: probenum should be unsigned.
  *
  * @return A pointer to the requested probe's 'struct sr_probe', or NULL
  *         if the probe could not be found.
  */
-struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum)
+struct sr_probe *sr_device_probe_find(const struct sr_device *device,
+				      int probenum)
 {
 	GSList *l;
 	struct sr_probe *p, *found_probe;
@@ -338,7 +321,6 @@ struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum)
  * If the probe already has a different name assigned to it, it will be
  * removed, and the new name will be saved instead.
  *
- * TODO: device can be const?
  * TODO: Rename to sr_device_set_probe_name().
  *
  * @param device TODO
@@ -382,8 +364,6 @@ int sr_device_probe_name(struct sr_device *device, int probenum,
  *
  * TODO: Better description.
  *
- * TODO: device can be const?
- *
  * @param device TODO
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
@@ -422,8 +402,6 @@ int sr_device_trigger_clear(struct sr_device *device)
  * TODO: Better description.
  * TODO: Describe valid format of the 'trigger' string.
  *
- * TODO: device can be const?
- *
  * @param device TODO. Must not be NULL.
  * @param probenum The number of the probe. TODO.
  *                 Note that the probe numbers start at 1 (not 0!).
@@ -467,7 +445,6 @@ int sr_device_trigger_set(struct sr_device *device, int probenum,
  * Determine whether the specified device has the specified capability.
  *
  * TODO: Should return int?
- * TODO: device can be const.
  *
  * @param device Pointer to the device to be checked. Must not be NULL.
  *               The device's 'plugin' field must not be NULL either.
@@ -478,7 +455,7 @@ int sr_device_trigger_set(struct sr_device *device, int probenum,
  *         FALSE is also returned upon invalid input parameters or other
  *         error conditions.
  */
-gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap)
+gboolean sr_device_has_hwcap(const struct sr_device *device, int hwcap)
 {
 	int *capabilities, i;