---
include/libsigrok/proto.h | 7 ++
src/device.c | 135 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 3c69364..5db0130 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 char *sr_dev_inst_vendor_get(struct sr_dev_inst *sdi);
+SR_API char *sr_dev_inst_model_get(struct sr_dev_inst *sdi);
+SR_API char *sr_dev_inst_version_get(struct sr_dev_inst *sdi);
+SR_API char *sr_dev_inst_sernum_get(struct sr_dev_inst *sdi);
+SR_API 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 7bfaa4c..7e47548 100644
--- a/src/device.c
+++ b/src/device.c
@@ -475,4 +475,139 @@ 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 A copy of the vendor string or NULL. The caller is responsible for
+ * g_free()ing the string when it is no longer needed.
+ */
+SR_API char *sr_dev_inst_vendor_get(struct sr_dev_inst *sdi)
+{
+ if (!sdi)
+ return NULL;
+
+ return g_strdup(sdi->vendor);
+}
+
+/**
+ * Queries a device instances' model.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return A copy of the model string or NULL. The caller is responsible for
+ * g_free()ing the string when it is no longer needed.
+ */
+SR_API char *sr_dev_inst_model_get(struct sr_dev_inst *sdi)
+{
+ if (!sdi)
+ return NULL;
+
+ return g_strdup(sdi->model);
+}
+
+/**
+ * Queries a device instances' version.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return A copy of the version string or NULL. The caller is responsible for
+ * g_free()ing the string when it is no longer needed.
+ */
+SR_API char *sr_dev_inst_version_get(struct sr_dev_inst *sdi)
+{
+ if (!sdi)
+ return NULL;
+
+ return g_strdup(sdi->version);
+}
+
+/**
+ * Queries a device instances' serial number.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return A copy of the serial number string or NULL. The caller is
responsible
+ * for g_free()ing the string when it is no longer needed.
+ */
+SR_API char *sr_dev_inst_sernum_get(struct sr_dev_inst *sdi)
+{
+ if (!sdi)
+ return NULL;
+
+ return g_strdup(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 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 g_strdup(sdi->connection_id);
+}
+
/** @} */
--
1.7.8.6
------------------------------------------------------------------------------
Slashdot TV. Videos for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
sigrok-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
