From owner-p4-projects@FreeBSD.ORG  Wed Aug 25 16:34:57 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 66F541065679; Wed, 25 Aug 2010 16:34:57 +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 29C65106566B
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 16:34:57 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 17AA38FC0C
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 16:34:57 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7PGYuPl070544
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 16:34:56 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7PGYu4V070541
	for perforce@freebsd.org; Wed, 25 Aug 2010 16:34:56 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 25 Aug 2010 16:34:56 GMT
Message-Id: <201008251634.o7PGYu4V070541@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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 182897 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, 25 Aug 2010 16:34:57 -0000

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

Change 182897 by hselasky@hselasky_laptop001 on 2010/08/25 16:33:57

	USB controller (XHCI):
		- fix isochronous frame ID computation.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#15 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#31 (text+ko) ====

@@ -1593,7 +1593,7 @@
 
 			dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
 			  XHCI_TRB_3_TYPE_SET(temp->trb_type) | 
-			  XHCI_TRB_3_FRID_SET(temp->isoc_frame) | 
+			  XHCI_TRB_3_FRID_SET(temp->isoc_frame / 8) | 
 			  XHCI_TRB_3_TBC_SET(temp->tbc) |
 			  XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
 

==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#15 (text+ko) ====

@@ -155,7 +155,7 @@
 
 /* XHCI runtime registers.  Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */
 #define	XHCI_MFINDEX		0x0000		/* RO - microframe index */
-#define	XHCI_MFINDEX_GET(x)	((x) & 0x1FFF)
+#define	XHCI_MFINDEX_GET(x)	((x) & 0x3FFF)
 #define	XHCI_IMAN(n)		(0x0020 + (0x20 * (n)))	/* XHCI interrupt management */
 #define	XHCI_IMAN_INTR_PEND	0x00000001	/* RW - interrupt pending */
 #define	XHCI_IMAN_INTR_ENA	0x00000002	/* RW - interrupt enable */