From 4959f4e18a2bb0de21abe66bbfe403b56f599856 Mon Sep 17 00:00:00 2001
From: Oleksij Rempel <o.rempel@pengutronix.de>
Date: Wed, 4 Jul 2018 16:58:00 +0200
Subject: [PATCH] Add jaylink_device_get_usb_bus_ports()

The function is needed for USB path filtering within OpenOCD. This
change bumps libusb version requirement to 1.0.16.

Signed-off-by: Marc Schink <jaylink-dev@marcschink.de>
[jaylink-dev@marcschink.de: Rework API and cleanups]
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 configure.ac            |  2 +-
 libjaylink/device.c     | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
 libjaylink/libjaylink.h |  3 +++
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index de5919c..7fc2a1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ PKG_PROG_PKG_CONFIG
 # Checks for libraries.
 
 # Check for libusb-1.0 which is always needed.
-PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
+PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
 	[HAVE_LIBUSB=yes], [HAVE_LIBUSB=no])
 
 AS_IF([test "x$HAVE_LIBUSB" = "xyes"],
diff --git a/libjaylink/device.c b/libjaylink/device.c
index a3bddf6..3a5f7d2 100644
--- a/libjaylink/device.c
+++ b/libjaylink/device.c
@@ -68,6 +68,9 @@
 #define REG_MAX_SIZE		0x200
 /** Size of a connection entry in bytes. */
 #define REG_CONN_INFO_SIZE	16
+
+/* The maximum path depth according to the USB 3.0 specification. */
+#define MAX_USB_PATH_DEPTH	7
 /** @endcond */
 
 /** @private */
@@ -286,6 +289,64 @@ JAYLINK_API int jaylink_device_get_usb_address(
 }
 
 /**
+ * Get the USB bus and port numbers of a device.
+ *
+ * @param[in] dev Device instance.
+ * @param[out] bus The bus number of the device on success and undefined on
+ *                 failure.
+ * @param[out] ports Newly allocated array which contains the port numbers on
+ *                   success and is undefined on failure. The array must be
+ *                   free'd by the caller.
+ * @param[out] length Length of the port array on success and undefined on
+ *                    failure.
+ *
+ * @retval JAYLINK_OK Success.
+ * @retval JAYLINK_ERR_ARG Invalid arguments.
+ * @retval JAYLINK_ERR_MALLOC Memory allocation error.
+ * @retval JAYLINK_ERR_NOT_SUPPORTED Supported for devices with host interface
+ *                                   #JAYLINK_HIF_USB only.
+ *
+ * @since 0.2.0
+ */
+JAYLINK_API int jaylink_device_get_usb_bus_ports(
+		const struct jaylink_device *dev, uint8_t *bus,
+		uint8_t **ports, size_t *length)
+{
+	if (!dev || !bus || !ports || !length)
+		return JAYLINK_ERR_ARG;
+
+	if (dev->iface != JAYLINK_HIF_USB)
+		return JAYLINK_ERR_NOT_SUPPORTED;
+
+#ifdef HAVE_LIBUSB
+	struct jaylink_context *ctx = dev->ctx;
+	int ret;
+
+	*ports = malloc(MAX_USB_PATH_DEPTH * sizeof(uint8_t));
+
+	if (!*ports) {
+		return JAYLINK_ERR_MALLOC;
+	}
+
+	ret = libusb_get_port_numbers(dev->usb_dev, *ports,
+		MAX_USB_PATH_DEPTH);
+
+	if (ret == LIBUSB_ERROR_OVERFLOW) {
+		log_err(ctx, "Failed to get port numbers: %s.",
+			libusb_error_name(ret));
+		return JAYLINK_ERR_ARG;
+	}
+
+	*length = ret;
+	*bus = libusb_get_bus_number(dev->usb_dev);
+
+	return JAYLINK_OK;
+#else
+	return JAYLINK_ERR_NOT_SUPPORTED;
+#endif
+}
+
+/**
  * Get the IPv4 address string of a device.
  *
  * @param[in] dev Device instance.
diff --git a/libjaylink/libjaylink.h b/libjaylink/libjaylink.h
index a542c05..1de95c9 100644
--- a/libjaylink/libjaylink.h
+++ b/libjaylink/libjaylink.h
@@ -461,6 +461,9 @@ JAYLINK_API int jaylink_device_get_serial_number(
 JAYLINK_API int jaylink_device_get_usb_address(
 		const struct jaylink_device *dev,
 		enum jaylink_usb_address *address);
+JAYLINK_API int jaylink_device_get_usb_bus_ports(
+		const struct jaylink_device *dev, uint8_t *bus,
+		uint8_t **ports, size_t *length);
 JAYLINK_API int jaylink_device_get_ipv4_address(
 		const struct jaylink_device *dev, char *address);
 JAYLINK_API int jaylink_device_get_mac_address(
-- 
2.11.4.GIT