aboutsummaryrefslogtreecommitdiff
path: root/lib/libusb
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2013-06-07 13:45:58 +0000
committerEd Maste <emaste@FreeBSD.org>2013-06-07 13:45:58 +0000
commita9205626a7e2f89486e637d6187ff99c17efeb10 (patch)
tree6e18f5faad04e68fdc5ef52f398f1bfbe4468244 /lib/libusb
parentf8afe3379550f179495ed5ed4cd7f6ef88a71ea8 (diff)
Notes
Diffstat (limited to 'lib/libusb')
-rw-r--r--lib/libusb/libusb.38
-rw-r--r--lib/libusb/libusb.h1
-rw-r--r--lib/libusb/libusb10.c6
3 files changed, 13 insertions, 2 deletions
diff --git a/lib/libusb/libusb.3 b/lib/libusb/libusb.3
index 28dff946d5a8..b50981cf5d5c 100644
--- a/lib/libusb/libusb.3
+++ b/lib/libusb/libusb.3
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 7, 2013
+.Dd June 7, 2013
.Dt LIBUSB 3
.Os
.Sh NAME
@@ -103,7 +103,7 @@ Returns the number of the bus contained by the device
.Fa dev .
.Pp
.Ft int
-.Fn libusb_get_port_path "libusb_context *ctx" "libusb_device *dev" "uint8_t *buf" "uint8_t bufsize"
+.Fn libusb_get_port_numbers "libusb_device *dev" "uint8_t *buf" "uint8_t bufsize"
Stores, in the buffer
.Fa buf
of size
@@ -111,6 +111,10 @@ of size
the list of all port numbers from root for the device
.Fa dev .
.Pp
+.Ft int
+.Fn libusb_get_port_path "libusb_context *ctx" "libusb_device *dev" "uint8_t *buf" "uint8_t bufsize"
+Deprecated function equivalent to libusb_get_port_numbers.
+.Pp
.Ft uint8_t
.Fn libusb_get_device_address "libusb_device *dev"
Returns the device_address contained by the device
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 220a8daf7c90..b14990eda50d 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -369,6 +369,7 @@ void libusb_exit(struct libusb_context *ctx);
ssize_t libusb_get_device_list(libusb_context * ctx, libusb_device *** list);
void libusb_free_device_list(libusb_device ** list, int unref_devices);
uint8_t libusb_get_bus_number(libusb_device * dev);
+int libusb_get_port_numbers(libusb_device *dev, uint8_t *buf, uint8_t bufsize);
int libusb_get_port_path(libusb_context *ctx, libusb_device *dev, uint8_t *buf, uint8_t bufsize);
uint8_t libusb_get_device_address(libusb_device * dev);
enum libusb_speed libusb_get_device_speed(libusb_device * dev);
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index 802bc8a878f8..79a570ed543f 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -291,6 +291,12 @@ libusb_get_bus_number(libusb_device *dev)
}
int
+libusb_get_port_numbers(libusb_device *dev, uint8_t *buf, uint8_t bufsize)
+{
+ return (libusb20_dev_get_port_path(dev->os_priv, buf, bufsize));
+}
+
+int
libusb_get_port_path(libusb_context *ctx, libusb_device *dev, uint8_t *buf,
uint8_t bufsize)
{