X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=740ad5077cebcf350e99757e575dc0901c030a13;hb=20af610683e4d7fc22deaa26e7b92730057405cd;hp=528a2af11a26da317d2fd1c8e834bdcef959812e;hpb=a5f2e70712827c48a095204ef48c7cf1a0193ed0;p=libsigrok.git

diff --git a/device.c b/device.c
index 528a2af1..740ad507 100644
--- a/device.c
+++ b/device.c
@@ -19,9 +19,44 @@
 
 #include <stdio.h>
 #include <glib.h>
+#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/**
+ * @file
+ *
+ * Device handling in libsigrok.
+ */
+
+/**
+ * @defgroup grp_devices Devices
+ *
+ * Device handling in libsigrok.
+ *
+ * @{
+ */
+
+/** @private */
+SR_PRIV struct sr_probe *sr_probe_new(int index, int type,
+		gboolean enabled, const char *name)
+{
+	struct sr_probe *probe;
+
+	if (!(probe = g_try_malloc0(sizeof(struct sr_probe)))) {
+		sr_err("hwdriver: probe malloc failed");
+		return NULL;
+	}
+
+	probe->index = index;
+	probe->type = type;
+	probe->enabled = enabled;
+	if (name)
+		probe->name = g_strdup(name);
+
+	return probe;
+}
+
 /**
  * Set the name of the specified probe in the specified device.
  *
@@ -132,9 +167,10 @@ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
 }
 
 /**
- * Determine whether the specified device has the specified capability.
+ * Determine whether the specified device instance has the specified
+ * capability.
  *
- * @param dev Pointer to the device instance to be checked. Must not be NULL.
+ * @param sdi Pointer to the device instance to be checked. Must not be NULL.
  *            If the device's 'driver' field is NULL (virtual device), this
  *            function will always return FALSE (virtual devices don't have
  *            a hardware capabilities list).
@@ -165,3 +201,135 @@ SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap)
 	return FALSE;
 }
 
+/** @private */
+SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
+		const char *vendor, const char *model, const char *version)
+{
+	struct sr_dev_inst *sdi;
+
+	if (!(sdi = g_try_malloc(sizeof(struct sr_dev_inst)))) {
+		sr_err("hwdriver: %s: sdi malloc failed", __func__);
+		return NULL;
+	}
+
+	sdi->driver = NULL;
+	sdi->index = index;
+	sdi->status = status;
+	sdi->inst_type = -1;
+	sdi->vendor = vendor ? g_strdup(vendor) : NULL;
+	sdi->model = model ? g_strdup(model) : NULL;
+	sdi->version = version ? g_strdup(version) : NULL;
+	sdi->probes = NULL;
+	sdi->priv = NULL;
+
+	return sdi;
+}
+
+/** @private */
+SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
+{
+	struct sr_probe *probe;
+	GSList *l;
+
+	for (l = sdi->probes; l; l = l->next) {
+		probe = l->data;
+		g_free(probe->name);
+		g_free(probe);
+	}
+
+	g_free(sdi->priv);
+	g_free(sdi->vendor);
+	g_free(sdi->model);
+	g_free(sdi->version);
+	g_free(sdi);
+
+}
+
+#ifdef HAVE_LIBUSB_1_0
+
+/** @private */
+SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
+			uint8_t address, struct libusb_device_handle *hdl)
+{
+	struct sr_usb_dev_inst *udi;
+
+	if (!(udi = g_try_malloc(sizeof(struct sr_usb_dev_inst)))) {
+		sr_err("hwdriver: %s: udi malloc failed", __func__);
+		return NULL;
+	}
+
+	udi->bus = bus;
+	udi->address = address;
+	udi->devhdl = hdl;
+
+	return udi;
+}
+
+/** @private */
+SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
+{
+	/* Avoid compiler warnings. */
+	(void)usb;
+
+	/* Nothing to do for this device instance type. */
+}
+
+#endif
+
+/** @private */
+SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
+							  int fd)
+{
+	struct sr_serial_dev_inst *serial;
+
+	if (!(serial = g_try_malloc(sizeof(struct sr_serial_dev_inst)))) {
+		sr_err("hwdriver: %s: serial malloc failed", __func__);
+		return NULL;
+	}
+
+	serial->port = g_strdup(port);
+	serial->fd = fd;
+
+	return serial;
+}
+
+/** @private */
+SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
+{
+	g_free(serial->port);
+}
+
+SR_API int sr_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+		const void *value)
+{
+	int ret;
+
+	if (!sdi || !sdi->driver || !sdi->driver->dev_config_set) {
+		sr_err("hwdriver: unable to set config option");
+		return SR_ERR;
+	}
+
+	ret = sdi->driver->dev_config_set(sdi, hwcap, value);
+
+	return ret;
+}
+
+SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
+{
+
+	if (driver && driver->dev_list)
+		return driver->dev_list();
+	else
+		return NULL;
+}
+
+SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver)
+{
+
+	if (driver && driver->dev_clear)
+		return driver->dev_clear();
+	else
+		return SR_OK;
+}
+
+/** @} */