svn commit: r254568 - stable/9/lib/libusb

[Ed Maste]

Author: emaste
Date: Tue Aug 20 14:29:43 2013
New Revision: 254568
URL: http://svnweb.freebsd.org/changeset/base/254568

Log:
  MFC r250342, r251495:
  
    Add libusb_get_port_path wrapper
  
    This follows the libusbx API reference at
    http://libusbx.sourceforge.net/api-1.0/group__dev.html
  
    Add libusb_get_port_numbers
  
    libusbx deprecated libusb_get_port_path and replaced it with
    libusb_get_port_numbers.  The latter omits an extra parameter which was
    unused in the FreeBSD implementation anyway.

Modified:
  stable/9/lib/libusb/libusb.3
  stable/9/lib/libusb/libusb.h
  stable/9/lib/libusb/libusb10.c
Directory Properties:
  stable/9/lib/libusb/   (props changed)

Modified: stable/9/lib/libusb/libusb.3
==============================================================================
--- stable/9/lib/libusb/libusb.3	Tue Aug 20 14:25:44 2013	(r254567)
+++ stable/9/lib/libusb/libusb.3	Tue Aug 20 14:29:43 2013	(r254568)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 12, 2012
+.Dd August 20, 2013
 .Dt LIBUSB 3
 .Os
 .Sh NAME
@@ -102,6 +102,19 @@ counter decremented once.
 Returns the number of the bus contained by the device
 .Fa dev .
 .Pp
+.Ft int
+.Fn libusb_get_port_numbers "libusb_device *dev" "uint8_t *buf" "uint8_t bufsize"
+Stores, in the buffer
+.Fa buf
+of size
+.Fa bufsize ,
+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

Modified: stable/9/lib/libusb/libusb.h
==============================================================================
--- stable/9/lib/libusb/libusb.h	Tue Aug 20 14:25:44 2013	(r254567)
+++ stable/9/lib/libusb/libusb.h	Tue Aug 20 14:29:43 2013	(r254568)
@@ -367,6 +367,8 @@ void	libusb_exit(struct libusb_context *
 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);
 int	libusb_clear_halt(libusb_device_handle *devh, uint8_t endpoint);

Modified: stable/9/lib/libusb/libusb10.c
==============================================================================
--- stable/9/lib/libusb/libusb10.c	Tue Aug 20 14:25:44 2013	(r254567)
+++ stable/9/lib/libusb/libusb10.c	Tue Aug 20 14:29:43 2013	(r254568)
@@ -284,6 +284,19 @@ libusb_get_bus_number(libusb_device *dev
 	return (libusb20_dev_get_bus_number(dev->os_priv));
 }
 
+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)
+{
+	return (libusb20_dev_get_port_path(dev->os_priv, buf, bufsize));
+}
+
 uint8_t
 libusb_get_device_address(libusb_device *dev)
 {