svn commit: r208237 - stable/8/lib/libusb

[Andrew Thompson]

Author: thompsa
Date: Mon May 17 23:59:14 2010
New Revision: 208237
URL: http://svn.freebsd.org/changeset/base/208237

Log:
  MFC r203773
  
   Within libusb 0.1 API, bus number is always faked to 0. Device numbers,
   however, are possitive and seem to be reverse sorted in the list.
  
   Conform device numbering and bring a result that is consistent with the
   libusb 0.1 API.  It is now possible to distinguish a device based on its
   (bus, dev) numbers.

Modified:
  stable/8/lib/libusb/libusb20_compat01.c
Directory Properties:
  stable/8/lib/libusb/   (props changed)
  stable/8/lib/libusb/usb.h   (props changed)

Modified: stable/8/lib/libusb/libusb20_compat01.c
==============================================================================
--- stable/8/lib/libusb/libusb20_compat01.c	Mon May 17 23:57:34 2010	(r208236)
+++ stable/8/lib/libusb/libusb20_compat01.c	Mon May 17 23:59:14 2010	(r208237)
@@ -829,6 +829,7 @@ usb_find_devices(void)
 	struct libusb20_device *pdev;
 	struct usb_device *udev;
 	struct LIBUSB20_DEVICE_DESC_DECODED *ddesc;
+	int devnum;
 	int err;
 
 	/* cleanup after last device search */
@@ -855,6 +856,7 @@ usb_find_devices(void)
 	}
 	/* iterate all devices */
 
+	devnum = 1;
 	pdev = NULL;
 	while ((pdev = libusb20_be_device_foreach(usb_backend, pdev))) {
 		udev = malloc(sizeof(*udev));
@@ -891,6 +893,7 @@ usb_find_devices(void)
 			/* truncate number of configurations */
 			udev->descriptor.bNumConfigurations = USB_MAXCONFIG;
 		}
+		udev->devnum = devnum++;
 		/* link together the two structures */
 		udev->dev = pdev;
 		pdev->privLuData = udev;