PERFORCE change 169355 for review

[Hans Petter Selasky]

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

Change 169355 by hselasky at hselasky_laptop001 on 2009/10/10 08:49:12

	
	USB controller:
	 - fix order of header file inclusion.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#11 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#11 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#11 edit

Differences ...

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

@@ -83,6 +83,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
 
 #define	EHCI_BUS2SC(bus) \
    ((ehci_softc_t *)(((uint8_t *)(bus)) - \

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

@@ -40,8 +40,6 @@
 
 #define	EHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-#include <dev/usb/controller/ehcireg.h>
-
 /*
  * Alignment NOTE: structures must be aligned so that the hardware can index
  * without performing addition.

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

@@ -62,6 +62,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
 
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>

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

@@ -69,6 +69,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
 
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>

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

@@ -84,6 +84,7 @@
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/usb_pci.h>
 #include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
 
 #define	PCI_EHCI_VENDORID_ACERLABS	0x10b9
 #define	PCI_EHCI_VENDORID_AMD		0x1022

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

@@ -72,6 +72,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ohci.h>
+#include <dev/usb/controller/ohcireg.h>
 
 #define	OHCI_BUS2SC(bus) \
    ((ohci_softc_t *)(((uint8_t *)(bus)) - \

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

@@ -41,8 +41,6 @@
 
 #define	OHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-#include <dev/usb/controller/ohcireg.h>
-
 #define	OHCI_NO_INTRS		32
 #define	OHCI_HCCA_SIZE		256
 

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

@@ -56,6 +56,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ohci.h>
+#include <dev/usb/controller/ohcireg.h>
 
 #include <sys/rman.h>
 

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

@@ -81,6 +81,7 @@
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/usb_pci.h>
 #include <dev/usb/controller/ohci.h>
+#include <dev/usb/controller/ohcireg.h>
 
 #define	PCI_OHCI_VENDORID_ACERLABS	0x10b9
 #define	PCI_OHCI_VENDORID_AMD		0x1022

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

@@ -75,6 +75,7 @@
 #include <dev/usb/usb_controller.h>
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/uhci.h>
+#include <dev/usb/controller/uhcireg.h>
 
 #define	alt_next next
 #define	UHCI_BUS2SC(bus) \

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

@@ -41,8 +41,6 @@
 
 #define	UHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
 
-#include <dev/usb/controller/uhcireg.h>
-
 #define	UHCI_FRAMELIST_COUNT	1024	/* units */
 #define	UHCI_FRAMELIST_ALIGN	4096	/* bytes */
 

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

@@ -81,6 +81,7 @@
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/usb_pci.h>
 #include <dev/usb/controller/uhci.h>
+#include <dev/usb/controller/uhcireg.h>
 
 #define	PCI_UHCI_VENDORID_INTEL		0x8086
 #define	PCI_UHCI_VENDORID_VIA		0x1106