From owner-p4-projects@FreeBSD.ORG  Sun Nov 16 11:34:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D7D41065674; Sun, 16 Nov 2008 11:34:59 +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 019AD106564A
	for <perforce@FreeBSD.org>; Sun, 16 Nov 2008 11:34:59 +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 E34108FC0C
	for <perforce@FreeBSD.org>; Sun, 16 Nov 2008 11:34:58 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAGBYwIe023647
	for <perforce@FreeBSD.org>; Sun, 16 Nov 2008 11:34:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAGBYw6Q023645
	for perforce@freebsd.org; Sun, 16 Nov 2008 11:34:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 16 Nov 2008 11:34:58 GMT
Message-Id: <200811161134.mAGBYw6Q023645@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 153027 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: Sun, 16 Nov 2008 11:34:59 -0000

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

Change 153027 by hselasky@hselasky_laptop001 on 2008/11/16 11:34:16

	
	Improve USB re-enumeration code.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#23 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#23 (text+ko) ====

@@ -1325,16 +1325,17 @@
 usb2_error_t
 usb2_req_re_enumerate(struct usb2_device *udev, struct mtx *mtx)
 {
-	struct usb2_device_descriptor ddesc;
 	struct usb2_device *parent_hub;
 	usb2_error_t err;
 	uint8_t old_addr;
 
+	if (udev->flags.usb2_mode != USB_MODE_HOST) {
+		return (USB_ERR_INVAL);
+	}
 	old_addr = udev->address;
 	parent_hub = udev->parent_hub;
 	if (parent_hub == NULL) {
-		err = USB_ERR_INVAL;
-		goto done;
+		return (USB_ERR_INVAL);
 	}
 	err = usb2_req_reset_port(parent_hub, mtx, udev->port_no);
 	if (err) {
@@ -1347,6 +1348,9 @@
 	 */
 	udev->address = USB_START_ADDR;
 
+	/* reset "bMaxPacketSize" */
+	udev->ddesc.bMaxPacketSize = USB_MAX_IPACKET;
+
 	/*
 	 * Restore device address:
 	 */
@@ -1364,7 +1368,15 @@
 	usb2_pause_mtx(mtx, USB_SET_ADDRESS_SETTLE);
 
 	/* get the device descriptor */
-	err = usb2_req_get_device_desc(udev, mtx, &ddesc);
+	err = usb2_req_get_desc(udev, mtx, &udev->ddesc,
+	    USB_MAX_IPACKET, USB_MAX_IPACKET, 0, UDESC_DEVICE, 0, 0);
+	if (err) {
+		DPRINTFN(0, "getting device descriptor "
+		    "at addr %d failed!\n", udev->address);
+		goto done;
+	}
+	/* get the full device descriptor */
+	err = usb2_req_get_device_desc(udev, mtx, &udev->ddesc);
 	if (err) {
 		DPRINTFN(0, "addr=%d, getting device "
 		    "descriptor failed!\n", old_addr);