PERFORCE change 182897 for review

[Hans Petter Selasky]

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

Change 182897 by hselasky at 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 */