From owner-p4-projects@FreeBSD.ORG  Wed Aug  4 16:20:49 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B07DA10656DC; Wed,  4 Aug 2010 16:20:49 +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 745B810656D7
	for <perforce@FreeBSD.org>; Wed,  4 Aug 2010 16:20:49 +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 610A88FC24
	for <perforce@FreeBSD.org>; Wed,  4 Aug 2010 16:20:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o74GKn8x011546
	for <perforce@FreeBSD.org>; Wed, 4 Aug 2010 16:20:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o74GKndD011544
	for perforce@freebsd.org; Wed, 4 Aug 2010 16:20:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 4 Aug 2010 16:20:49 GMT
Message-Id: <201008041620.o74GKndD011544@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181840 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 04 Aug 2010 16:20:50 -0000

http://p4web.freebsd.org/@@181840?ac=10

Change 181840 by hselasky@hselasky_laptop001 on 2010/08/04 16:20:04

	USB core (HUB):
		- program the U1/U2 port timeouts after we know the port speed.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#53 edit

Differences ...

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

@@ -472,6 +472,23 @@
 		speed = udev->speed;
 		break;
 	}
+	if (speed == USB_SPEED_HIGH) {
+		err = usbd_req_set_hub_u1_timeout(udev, NULL,
+		    portno, 128 - (2 * udev->depth));
+		if (err) {
+			DPRINTFN(0, "port %d U1 timeout "
+			    "failed, error=%s\n",
+			    portno, usbd_errstr(err));
+		}
+		err = usbd_req_set_hub_u2_timeout(udev, NULL,
+		    portno, 128 - (2 * udev->depth));
+		if (err) {
+			DPRINTFN(0, "port %d U2 timeout "
+			    "failed, error=%s\n",
+			    portno, usbd_errstr(err));
+		}
+	}
+
 	/*
 	 * Figure out the device mode
 	 *
@@ -1025,14 +1042,6 @@
 				removable++;
 			break;
 		case USB_SPEED_SUPER:
-			if (!err) {
-				err = usbd_req_set_hub_u1_timeout(udev, NULL,
-				    portno, 128 - (2 * udev->depth));
-			}
-			if (!err) {
-				err = usbd_req_set_hub_u2_timeout(udev, NULL,
-				    portno, 128 - (2 * udev->depth));
-			}
 			if (!UHD_NOT_REMOV(&hubdesc30, portno))
 				removable++;
 			break;