From owner-svn-src-head@FreeBSD.ORG  Thu Feb 11 08:24:36 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0BC94106566B;
	Thu, 11 Feb 2010 08:24:36 +0000 (UTC)
	(envelope-from wkoszek@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EE5B58FC0A;
	Thu, 11 Feb 2010 08:24:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1B8OZcG018580;
	Thu, 11 Feb 2010 08:24:35 GMT (envelope-from wkoszek@svn.freebsd.org)
Received: (from wkoszek@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1B8OZbo018578;
	Thu, 11 Feb 2010 08:24:35 GMT (envelope-from wkoszek@svn.freebsd.org)
Message-Id: <201002110824.o1B8OZbo018578@svn.freebsd.org>
From: "Wojciech A. Koszek" <wkoszek@FreeBSD.org>
Date: Thu, 11 Feb 2010 08:24:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203773 - head/lib/libusb
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Feb 2010 08:24:36 -0000

Author: wkoszek
Date: Thu Feb 11 08:24:35 2010
New Revision: 203773
URL: http://svn.freebsd.org/changeset/base/203773

Log:
  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.
  
  There shouldn't be any negative change in behavior after this commit.
  
  Tested with:    scanimage (sane)
  		http://freebsd.czest.pl/~wkoszek/qemu/l.c
  Reviewed by:    hps@

Modified:
  head/lib/libusb/libusb20_compat01.c

Modified: head/lib/libusb/libusb20_compat01.c
==============================================================================
--- head/lib/libusb/libusb20_compat01.c	Thu Feb 11 07:09:04 2010	(r203772)
+++ head/lib/libusb/libusb20_compat01.c	Thu Feb 11 08:24:35 2010	(r203773)
@@ -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;