From owner-p4-projects@FreeBSD.ORG  Sat Dec 29 17:10:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 56B9016A420; Sat, 29 Dec 2007 17:10:12 +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 1C84216A41A
	for <perforce@FreeBSD.org>; Sat, 29 Dec 2007 17:10:12 +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 0BBEC13C469
	for <perforce@FreeBSD.org>; Sat, 29 Dec 2007 17:10:12 +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 lBTHABCH026717
	for <perforce@FreeBSD.org>; Sat, 29 Dec 2007 17:10:11 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBTHABJp026713
	for perforce@freebsd.org; Sat, 29 Dec 2007 17:10:11 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 29 Dec 2007 17:10:11 GMT
Message-Id: <200712291710.lBTHABJp026713@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 131972 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: Sat, 29 Dec 2007 17:10:12 -0000

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

Change 131972 by hselasky@hselasky_laptop001 on 2007/12/29 17:09:23

	
	If there are zero configurations in the device qualifier
	there should be no need to support the other speed
	configuration descriptor.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#67 edit

Differences ...

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

@@ -1813,8 +1813,8 @@
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
 	.bDeviceProtocol = UDPROTO_FSHUB,
-	.bMaxPacketSize0 = 64,
-	.bNumConfigurations = 1,
+	.bMaxPacketSize0 = 0,
+	.bNumConfigurations = 0,
 };
 
 static const struct at9100_dci_config_desc at9100_dci_confd = {

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

@@ -2971,8 +2971,8 @@
 	UDCLASS_HUB,			/* class */
 	UDSUBCLASS_HUB,			/* subclass */
 	UDPROTO_FSHUB,			/* protocol */
-	64,				/* max packet */
-	1,				/* # of configurations */
+	0,				/* max packet */
+	0,				/* # of configurations */
 	0
 };
 
@@ -2980,9 +2980,7 @@
 	.confd = {
 		sizeof(usb_config_descriptor_t),
 		UDESC_CONFIG,
-		{USB_CONFIG_DESCRIPTOR_SIZE +
-			USB_INTERFACE_DESCRIPTOR_SIZE +
-		USB_ENDPOINT_DESCRIPTOR_SIZE},
+		sizeof(ehci_confd),
 		1,
 		1,
 		0,
@@ -3140,12 +3138,7 @@
 			std->len = sizeof(ehci_odevd);
 			sc->sc_hub_desc.odevd = ehci_odevd;
 			break;
-			/*
-			 * We can't really operate at another speed,
-			 * but the specification says we need this
-			 * descriptor:
-			 */
-		case UDESC_OTHER_SPEED_CONFIGURATION:
+
 		case UDESC_CONFIG:
 			if ((value & 0xff) != 0) {
 				std->err = USBD_IOERROR;
@@ -3153,8 +3146,6 @@
 			}
 			std->len = sizeof(ehci_confd);
 			sc->sc_hub_desc.confd = ehci_confd;
-			sc->sc_hub_desc.confd.confd.bDescriptorType =
-			    (value >> 8);
 			break;
 
 		case UDESC_STRING: