From owner-p4-projects@FreeBSD.ORG  Tue Dec 25 19:28:04 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9223116A41A; Tue, 25 Dec 2007 19:28:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2132216A417
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 19:28:04 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E95B513C44B
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 19:28:03 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBPJS22M023789
	for <perforce@FreeBSD.org>; Tue, 25 Dec 2007 19:28:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBPJS2QQ023786
	for perforce@freebsd.org; Tue, 25 Dec 2007 19:28:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 25 Dec 2007 19:28:02 GMT
Message-Id: <200712251928.lBPJS2QQ023786@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 131604 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2007 19:28:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=131604

Change 131604 by hselasky@hselasky_laptop001 on 2007/12/25 19:27:12

	
	Get "bInterfaceNumber" right. The variable is incremented
	prior to writing it into the interface structures, so we
	need to start at minus one, so that the first interface
	gets a value of zero.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_template.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_template.c#10 (text+ko) ====

@@ -256,7 +256,7 @@
 
 	/* Reset some counters */
 
-	temp->bInterfaceNumber = 0;
+	temp->bInterfaceNumber = 0 - 1;
 	temp->bAlternateSetting = 0;
 
 	/* Scan all the USB interfaces */
@@ -281,7 +281,7 @@
 		cd->bLength = sizeof(*cd);
 		cd->bDescriptorType = UDESC_CONFIG;
 		USETW(cd->wTotalLength, old_size);
-		cd->bNumInterface = temp->bInterfaceNumber;
+		cd->bNumInterface = temp->bInterfaceNumber + 1;
 		cd->bConfigurationValue = temp->bConfigurationValue;
 		cd->iConfiguration = tcd->iConfiguration;
 		cd->bmAttributes = tcd->bmAttributes;