svn commit: r222140 - in stable/8/sys/dev: pci usb/controller

[Ruslan Ermilov]

Author: ru
Date: Fri May 20 17:40:21 2011
New Revision: 222140
URL: http://svn.freebsd.org/changeset/base/222140

Log:
  MFC r222018: Renamed PCI_INTERFACE_XHCI to PCIP_SERIALBUS_USB_XHCI
  and moved it to <dev/pci/pcireg.h>.

Modified:
  stable/8/sys/dev/pci/pcireg.h
  stable/8/sys/dev/usb/controller/xhci_pci.c
  stable/8/sys/dev/usb/controller/xhcireg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/pci/pcireg.h
==============================================================================
--- stable/8/sys/dev/pci/pcireg.h	Fri May 20 17:35:10 2011	(r222139)
+++ stable/8/sys/dev/pci/pcireg.h	Fri May 20 17:40:21 2011	(r222140)
@@ -367,6 +367,7 @@
 #define	PCIP_SERIALBUS_USB_UHCI		0x00
 #define	PCIP_SERIALBUS_USB_OHCI		0x10
 #define	PCIP_SERIALBUS_USB_EHCI		0x20
+#define	PCIP_SERIALBUS_USB_XHCI		0x30
 #define	PCIP_SERIALBUS_USB_DEVICE	0xfe
 #define	PCIS_SERIALBUS_FC	0x04
 #define	PCIS_SERIALBUS_SMBUS	0x05

Modified: stable/8/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/xhci_pci.c	Fri May 20 17:35:10 2011	(r222139)
+++ stable/8/sys/dev/usb/controller/xhci_pci.c	Fri May 20 17:40:21 2011	(r222140)
@@ -137,7 +137,7 @@ xhci_pci_match(device_t self)
 {
 	if ((pci_get_class(self) == PCIC_SERIALBUS)
 	    && (pci_get_subclass(self) == PCIS_SERIALBUS_USB)
-	    && (pci_get_progif(self) == PCI_INTERFACE_XHCI)) {
+	    && (pci_get_progif(self) == PCIP_SERIALBUS_USB_XHCI)) {
 		return ("XHCI (generic) USB 3.0 controller");
 	}
 	return (NULL);			/* dunno */

Modified: stable/8/sys/dev/usb/controller/xhcireg.h
==============================================================================
--- stable/8/sys/dev/usb/controller/xhcireg.h	Fri May 20 17:35:10 2011	(r222139)
+++ stable/8/sys/dev/usb/controller/xhcireg.h	Fri May 20 17:40:21 2011	(r222140)
@@ -33,7 +33,6 @@
 #define	PCI_XHCI_USBREV		0x60	/* RO USB protocol revision */
 #define	PCI_USB_REV_3_0		0x30	/* USB 3.0 */
 #define	PCI_XHCI_FLADJ		0x61	/* RW frame length adjust */
-#define	PCI_INTERFACE_XHCI	0x30	/* USB 3.0 - XHCI */
 
 /* XHCI capability registers */
 #define	XHCI_CAPLENGTH		0x00	/* RO capability */