[PCIX]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61524

diff --git a/reactos/drivers/bus/pcix/arb/ar_busno.c b/reactos/drivers/bus/pcix/arb/ar_busno.c
index 74d8c5e..2751daa 100644 (file)
--- a/reactos/drivers/bus/pcix/arb/ar_busno.c
+++ b/reactos/drivers/bus/pcix/arb/ar_busno.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/arb/ar_memio.c b/reactos/drivers/bus/pcix/arb/ar_memio.c
index e0ceb0d..e6d0e91 100644 (file)
--- a/reactos/drivers/bus/pcix/arb/ar_memio.c
+++ b/reactos/drivers/bus/pcix/arb/ar_memio.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/arb/arb_comn.c b/reactos/drivers/bus/pcix/arb/arb_comn.c
index 42555a9..669cc2d 100644 (file)
--- a/reactos/drivers/bus/pcix/arb/arb_comn.c
+++ b/reactos/drivers/bus/pcix/arb/arb_comn.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/arb/tr_irq.c b/reactos/drivers/bus/pcix/arb/tr_irq.c
index 6e61de8..9841ca3 100644 (file)
--- a/reactos/drivers/bus/pcix/arb/tr_irq.c
+++ b/reactos/drivers/bus/pcix/arb/tr_irq.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/debug.c b/reactos/drivers/bus/pcix/debug.c
index 93cbf46..971cdad 100644 (file)
--- a/reactos/drivers/bus/pcix/debug.c
+++ b/reactos/drivers/bus/pcix/debug.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/device.c b/reactos/drivers/bus/pcix/device.c
index 84bb4a1..998533b 100644 (file)
--- a/reactos/drivers/bus/pcix/device.c
+++ b/reactos/drivers/bus/pcix/device.c
@@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 VOID

diff --git a/reactos/drivers/bus/pcix/dispatch.c b/reactos/drivers/bus/pcix/dispatch.c
index 9512fdc..6ff6a41 100644 (file)
--- a/reactos/drivers/bus/pcix/dispatch.c
+++ b/reactos/drivers/bus/pcix/dispatch.c
@@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 IO_COMPLETION_ROUTINE PciSetEventCompletion;

diff --git a/reactos/drivers/bus/pcix/enum.c b/reactos/drivers/bus/pcix/enum.c
index dc00550..7780667 100644 (file)
--- a/reactos/drivers/bus/pcix/enum.c
+++ b/reactos/drivers/bus/pcix/enum.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/fdo.c b/reactos/drivers/bus/pcix/fdo.c
index 67e2339..77698b2 100644 (file)
--- a/reactos/drivers/bus/pcix/fdo.c
+++ b/reactos/drivers/bus/pcix/fdo.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/guid.c b/reactos/drivers/bus/pcix/guid.c
index 7dd27e9..78a2723 100644 (file)
--- a/reactos/drivers/bus/pcix/guid.c
+++ b/reactos/drivers/bus/pcix/guid.c
@@ -1,19 +1,7 @@
-/*
- * PROJECT:         ReactOS PCI Bus Driver
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            drivers/bus/pci/guid.c
- * PURPOSE:         GUID Data
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
 
-/* INCLUDES *******************************************************************/
+#include <initguid.h>
+#include <ntddk.h>
+#include <wdmguid.h>
 
-#include <pci.h>
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS ********************************************************************/
-
-/* FUNCTIONS ******************************************************************/
-
-/* EOF */
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

diff --git a/reactos/drivers/bus/pcix/hookhal.c b/reactos/drivers/bus/pcix/hookhal.c
index d465cf3..bb8669c 100644 (file)
--- a/reactos/drivers/bus/pcix/hookhal.c
+++ b/reactos/drivers/bus/pcix/hookhal.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/init.c b/reactos/drivers/bus/pcix/init.c
index ddf8b05..2edf7c3 100644 (file)
--- a/reactos/drivers/bus/pcix/init.c
+++ b/reactos/drivers/bus/pcix/init.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/agpintrf.c b/reactos/drivers/bus/pcix/intrface/agpintrf.c
index 926d291..89c25ec 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/agpintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/agpintrf.c
@@ -9,6 +9,9 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
+#include <ntagp.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/busintrf.c b/reactos/drivers/bus/pcix/intrface/busintrf.c
index de3566c..93aecd3 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/busintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/busintrf.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/cardbus.c b/reactos/drivers/bus/pcix/intrface/cardbus.c
index 0349770..63c2ce6 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/cardbus.c
+++ b/reactos/drivers/bus/pcix/intrface/cardbus.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/devhere.c b/reactos/drivers/bus/pcix/intrface/devhere.c
index fc6bd11..9d2566c 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/devhere.c
+++ b/reactos/drivers/bus/pcix/intrface/devhere.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/ideintrf.c b/reactos/drivers/bus/pcix/intrface/ideintrf.c
index ec2ff82..b87fe5b 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/ideintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/ideintrf.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/intrface.c b/reactos/drivers/bus/pcix/intrface/intrface.c
index 47e78da..e430bd5 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/intrface.c
+++ b/reactos/drivers/bus/pcix/intrface/intrface.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/lddintrf.c b/reactos/drivers/bus/pcix/intrface/lddintrf.c
index 0cf4362..705c2c0 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/lddintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/lddintrf.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/locintrf.c b/reactos/drivers/bus/pcix/intrface/locintrf.c
index 0e79874..236b2be 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/locintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/locintrf.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/pmeintf.c b/reactos/drivers/bus/pcix/intrface/pmeintf.c
index ca440fd..2a6346a 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/pmeintf.c
+++ b/reactos/drivers/bus/pcix/intrface/pmeintf.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/intrface/routintf.c b/reactos/drivers/bus/pcix/intrface/routintf.c
index 67380be..e27b9ba 100644 (file)
--- a/reactos/drivers/bus/pcix/intrface/routintf.c
+++ b/reactos/drivers/bus/pcix/intrface/routintf.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/pci.h b/reactos/drivers/bus/pcix/pci.h
index 25774f7..b8cb9d0 100644 (file)
--- a/reactos/drivers/bus/pcix/pci.h
+++ b/reactos/drivers/bus/pcix/pci.h
@@ -6,18 +6,15 @@
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
-#include <initguid.h>
 #include <ntifs.h>
-#include <ntagp.h>
 #include <wdmguid.h>
 #include <wchar.h>
 #include <acpiioct.h>
 #include <drivers/pci/pci.h>
 #include <drivers/acpi/acpi.h>
-#include "halfuncs.h"
-#include "rtlfuncs.h"
-#include "vffuncs.h"
-#include "bugcodes.h"
+#include <ndk/halfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/vffuncs.h>
 
 //
 // Tag used in all pool allocations (Pci Bus)

diff --git a/reactos/drivers/bus/pcix/pci/busno.c b/reactos/drivers/bus/pcix/pci/busno.c
index caf7632..ec7fd12 100644 (file)
--- a/reactos/drivers/bus/pcix/pci/busno.c
+++ b/reactos/drivers/bus/pcix/pci/busno.c
@@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 BOOLEAN

diff --git a/reactos/drivers/bus/pcix/pci/config.c b/reactos/drivers/bus/pcix/pci/config.c
index 6d676da..bacd081 100644 (file)
--- a/reactos/drivers/bus/pcix/pci/config.c
+++ b/reactos/drivers/bus/pcix/pci/config.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/pci/devhere.c b/reactos/drivers/bus/pcix/pci/devhere.c
index 4a666b9..27f9b78 100644 (file)
--- a/reactos/drivers/bus/pcix/pci/devhere.c
+++ b/reactos/drivers/bus/pcix/pci/devhere.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/pci/id.c b/reactos/drivers/bus/pcix/pci/id.c
index 929ad66..1a90a66 100644 (file)
--- a/reactos/drivers/bus/pcix/pci/id.c
+++ b/reactos/drivers/bus/pcix/pci/id.c
@@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+#include <stdio.h>
+
 #define NDEBUG
 #include <debug.h>
-#include "stdio.h"
-
-/* GLOBALS ********************************************************************/
 
 /* FUNCTIONS ******************************************************************/
 

diff --git a/reactos/drivers/bus/pcix/pci/ppbridge.c b/reactos/drivers/bus/pcix/pci/ppbridge.c
index e988e18..2d0303d 100644 (file)
--- a/reactos/drivers/bus/pcix/pci/ppbridge.c
+++ b/reactos/drivers/bus/pcix/pci/ppbridge.c
@@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/
 
 ULONG

diff --git a/reactos/drivers/bus/pcix/pci/romimage.c b/reactos/drivers/bus/pcix/pci/romimage.c
index 96575f3..ce24e68 100644 (file)
--- a/reactos/drivers/bus/pcix/pci/romimage.c
+++ b/reactos/drivers/bus/pcix/pci/romimage.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/pci/state.c b/reactos/drivers/bus/pcix/pci/state.c
index 6219164..a2be64c 100644 (file)
--- a/reactos/drivers/bus/pcix/pci/state.c
+++ b/reactos/drivers/bus/pcix/pci/state.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/pcivrify.c b/reactos/drivers/bus/pcix/pcivrify.c
index 69046a3..2dce2eb 100644 (file)
--- a/reactos/drivers/bus/pcix/pcivrify.c
+++ b/reactos/drivers/bus/pcix/pcivrify.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/pdo.c b/reactos/drivers/bus/pcix/pdo.c
index 80deec0..6946fcd 100644 (file)
--- a/reactos/drivers/bus/pcix/pdo.c
+++ b/reactos/drivers/bus/pcix/pdo.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/power.c b/reactos/drivers/bus/pcix/power.c
index 06fc80f..efc29af 100644 (file)
--- a/reactos/drivers/bus/pcix/power.c
+++ b/reactos/drivers/bus/pcix/power.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/usage.c b/reactos/drivers/bus/pcix/usage.c
index b317439..771850b 100644 (file)
--- a/reactos/drivers/bus/pcix/usage.c
+++ b/reactos/drivers/bus/pcix/usage.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/bus/pcix/utils.c b/reactos/drivers/bus/pcix/utils.c
index 86ad92e..df367d2 100644 (file)
--- a/reactos/drivers/bus/pcix/utils.c
+++ b/reactos/drivers/bus/pcix/utils.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>