From: Soeren Apel <redacted>
Date: Thu, 16 Oct 2014 18:17:04 +0000 (+0200)
Subject: Provide getters for sr_dev_inst member access
X-Git-Tag: libsigrok-0.4.0~849
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0157fdce99dfb867b68a0799cfa3d5586042cb1f;p=libsigrok.git

Provide getters for sr_dev_inst member access
---

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 3c693642..51e02eca 100644
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -55,6 +55,13 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver);
 SR_API int sr_dev_open(struct sr_dev_inst *sdi);
 SR_API int sr_dev_close(struct sr_dev_inst *sdi);
 
+SR_API struct sr_dev_driver *sr_dev_inst_driver_get(struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_vendor_get(struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_model_get(struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_version_get(struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_sernum_get(struct sr_dev_inst *sdi);
+SR_API const char *sr_dev_inst_connid_get(struct sr_dev_inst *sdi);
+
 /*--- hwdriver.c ------------------------------------------------------------*/
 
 SR_API struct sr_dev_driver **sr_driver_list(void);
diff --git a/src/device.c b/src/device.c
index 9ed60802..ced46fa1 100644
--- a/src/device.c
+++ b/src/device.c
@@ -475,4 +475,135 @@ SR_API int sr_dev_close(struct sr_dev_inst *sdi)
 	return ret;
 }
 
+/**
+ * Queries a device instances' driver.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return The driver instance or NULL on error.
+ */
+SR_API struct sr_dev_driver *sr_dev_inst_driver_get(struct sr_dev_inst *sdi)
+{
+	if (!sdi || !sdi->driver)
+		return NULL;
+
+	return sdi->driver;
+}
+
+/**
+ * Queries a device instances' vendor.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return The vendor string or NULL.
+ */
+SR_API const char *sr_dev_inst_vendor_get(struct sr_dev_inst *sdi)
+{
+	if (!sdi)
+		return NULL;
+
+	return sdi->vendor;
+}
+
+/**
+ * Queries a device instances' model.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return The model string or NULL.
+ */
+SR_API const char *sr_dev_inst_model_get(struct sr_dev_inst *sdi)
+{
+	if (!sdi)
+		return NULL;
+
+	return sdi->model;
+}
+
+/**
+ * Queries a device instances' version.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return The version string or NULL.
+ */
+SR_API const char *sr_dev_inst_version_get(struct sr_dev_inst *sdi)
+{
+	if (!sdi)
+		return NULL;
+
+	return sdi->version;
+}
+
+/**
+ * Queries a device instances' serial number.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return The serial number string or NULL.
+ */
+SR_API const char *sr_dev_inst_sernum_get(struct sr_dev_inst *sdi)
+{
+	if (!sdi)
+		return NULL;
+
+	return sdi->serial_num;
+}
+
+/**
+ * Queries a device instances' connection identifier.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return A copy of the connection id string or NULL. The caller is responsible
+ *         for g_free()ing the string when it is no longer needed.
+ */
+SR_API const char *sr_dev_inst_connid_get(struct sr_dev_inst *sdi)
+{
+	struct drv_context *drvc;
+	struct sr_usb_dev_inst *usb;
+	struct libusb_device **devlist;
+	struct libusb_device_descriptor des;
+	int r, cnt, i, a, b;
+	char connection_id[64];
+
+	if (!sdi)
+		return NULL;
+
+	if ((!sdi->connection_id) && (sdi->inst_type == SR_INST_USB)) {
+		/* connection_id isn't populated, let's do that here. */
+
+		drvc = sdi->driver->priv;
+		usb = sdi->conn;
+
+		if ((cnt = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist)) < 0) {
+			sr_err("Failed to retrieve device list: %s.",
+			       libusb_error_name(cnt));
+			return NULL;
+		}
+
+		for (i = 0; i < cnt; i++) {
+			if ((r = libusb_get_device_descriptor(devlist[i], &des)) < 0) {
+				sr_err("Failed to get device descriptor: %s.",
+				       libusb_error_name(r));
+				continue;
+			}
+
+			/* Find the USB device by the logical address we know. */
+			b = libusb_get_bus_number(devlist[i]);
+			a = libusb_get_device_address(devlist[i]);
+			if (b != usb->bus || a != usb->address)
+				continue;
+
+			usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+			sdi->connection_id = g_strdup(connection_id);
+			break;
+		}
+
+		libusb_free_device_list(devlist, 1);
+	}
+
+	return sdi->connection_id;
+}
+
 /** @} */