From owner-p4-projects@FreeBSD.ORG  Sun Feb  8 20:26:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4D2A106567C; Sun,  8 Feb 2009 20:26:16 +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 8D6381065679
	for <perforce@FreeBSD.org>; Sun,  8 Feb 2009 20:26:16 +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 7B2438FC19
	for <perforce@FreeBSD.org>; Sun,  8 Feb 2009 20:26:16 +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 n18KQGcQ022365
	for <perforce@FreeBSD.org>; Sun, 8 Feb 2009 20:26:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n18KQGYG022363
	for perforce@freebsd.org; Sun, 8 Feb 2009 20:26:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 8 Feb 2009 20:26:16 GMT
Message-Id: <200902082026.n18KQGYG022363@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 157384 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, 08 Feb 2009 20:26:18 -0000

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

Change 157384 by hselasky@hselasky_laptop001 on 2009/02/08 20:25:45

	
	USB controller: EHCI High Speed Interrupt endpoint fix.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#32 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#32 (text+ko) ====

@@ -1896,8 +1896,17 @@
 	    EHCI_QH_SET_MPL(xfer->max_packet_size));
 
 	if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
-		qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) |
-		    EHCI_QH_DTC | EHCI_QH_SET_NRL(8));
+		if (methods != &ehci_device_intr_methods) {
+			qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) |
+			    EHCI_QH_DTC | EHCI_QH_SET_NRL(8));
+		} else {
+			/* 
+			 * Nak-Reload count must be zero for interrupt
+			 * endpoints See EHCI pdf file, section 4.9
+			 */
+			qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) |
+			    EHCI_QH_DTC);
+		}
 	} else {
 
 		if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) {