PERFORCE change 181867 for review

[Hans Petter Selasky]

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

Change 181867 by hselasky at hselasky_laptop001 on 2010/08/05 15:46:12

	USB controller (XHCI):
		- correct some register definitions.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#14 edit

Differences ...

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

@@ -117,7 +117,7 @@
 #define	XHCI_PS_PLS_GET(x)	(((x) >> 5) & 0xF)	/* RW - port link state */
 #define	XHCI_PS_PLS_SET(x)	(((x) & 0xF) << 5)	/* RW - port link state */
 #define	XHCI_PS_PP		0x00000100	/* RW - port power */
-#define	XHCI_PS_SPEED_GET(x)	(((x) >> 9) & 0xF)	/* RO - port speed */
+#define	XHCI_PS_SPEED_GET(x)	(((x) >> 10) & 0xF)	/* RO - port speed */
 #define	XHCI_PS_PIC_GET(x)	(((x) >> 14) & 0x3)	/* RW - port indicator */
 #define	XHCI_PS_PIC_SET(x)	(((x) & 0x3) << 14)	/* RW - port indicator */
 #define	XHCI_PS_LWS		0x00010000	/* RW - port link state write strobe */
@@ -171,7 +171,7 @@
 #define	XHCI_ERSTBA_LO(n)	(0x0030 + (0x20 * (n)))	/* XHCI event ring segment table BA */
 #define	XHCI_ERSTBA_HI(n)	(0x0034 + (0x20 * (n)))	/* XHCI event ring segment table BA */
 #define	XHCI_ERDP_LO(n)	(0x0038 + (0x20 * (n)))	/* XHCI event ring dequeue pointer */
-#define	XHCI_ERDP_LO_SIGET(x)	((x) & 0x7)	/* RO - dequeue segment index */
+#define	XHCI_ERDP_LO_SINDEX(x)	((x) & 0x7)	/* RO - dequeue segment index */
 #define	XHCI_ERDP_LO_BUSY	0x00000008	/* RW - event handler busy */
 #define	XHCI_ERDP_HI(n)	(0x003C + (0x20 * (n)))	/* XHCI event ring dequeue pointer */