From: Amine Khaldi Date: Sat, 4 Jan 2014 12:05:02 +0000 (+0000) Subject: [PCIX] X-Git-Tag: ReactOS-0.3.16~335 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=d4fa97943468f67225ab62e8b8cd8b8566d41a1b [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 74d8c5e322d..2751daa10dc 100644 --- a/reactos/drivers/bus/pcix/arb/ar_busno.c +++ b/reactos/drivers/bus/pcix/arb/ar_busno.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/arb/ar_memio.c b/reactos/drivers/bus/pcix/arb/ar_memio.c index e0ceb0d18b2..e6d0e917c09 100644 --- a/reactos/drivers/bus/pcix/arb/ar_memio.c +++ b/reactos/drivers/bus/pcix/arb/ar_memio.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/arb/arb_comn.c b/reactos/drivers/bus/pcix/arb/arb_comn.c index 42555a9310f..669cc2d5a60 100644 --- a/reactos/drivers/bus/pcix/arb/arb_comn.c +++ b/reactos/drivers/bus/pcix/arb/arb_comn.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/arb/tr_irq.c b/reactos/drivers/bus/pcix/arb/tr_irq.c index 6e61de8b099..9841ca3267f 100644 --- a/reactos/drivers/bus/pcix/arb/tr_irq.c +++ b/reactos/drivers/bus/pcix/arb/tr_irq.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/debug.c b/reactos/drivers/bus/pcix/debug.c index 93cbf465343..971cdadf498 100644 --- a/reactos/drivers/bus/pcix/debug.c +++ b/reactos/drivers/bus/pcix/debug.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/device.c b/reactos/drivers/bus/pcix/device.c index 84bb4a1f62c..998533b4415 100644 --- a/reactos/drivers/bus/pcix/device.c +++ b/reactos/drivers/bus/pcix/device.c @@ -9,11 +9,10 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include -/* GLOBALS ********************************************************************/ - /* FUNCTIONS ******************************************************************/ VOID diff --git a/reactos/drivers/bus/pcix/dispatch.c b/reactos/drivers/bus/pcix/dispatch.c index 9512fdcc9c2..6ff6a41d9ee 100644 --- a/reactos/drivers/bus/pcix/dispatch.c +++ b/reactos/drivers/bus/pcix/dispatch.c @@ -9,11 +9,10 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include -/* GLOBALS ********************************************************************/ - /* FUNCTIONS ******************************************************************/ IO_COMPLETION_ROUTINE PciSetEventCompletion; diff --git a/reactos/drivers/bus/pcix/enum.c b/reactos/drivers/bus/pcix/enum.c index dc00550f416..77806679e94 100644 --- a/reactos/drivers/bus/pcix/enum.c +++ b/reactos/drivers/bus/pcix/enum.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/fdo.c b/reactos/drivers/bus/pcix/fdo.c index 67e2339aae1..77698b288ea 100644 --- a/reactos/drivers/bus/pcix/fdo.c +++ b/reactos/drivers/bus/pcix/fdo.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/guid.c b/reactos/drivers/bus/pcix/guid.c index 7dd27e965ce..78a272379ea 100644 --- 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 +#include +#include -#include -#define NDEBUG -#include - -/* 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 d465cf37497..bb8669cba46 100644 --- a/reactos/drivers/bus/pcix/hookhal.c +++ b/reactos/drivers/bus/pcix/hookhal.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/init.c b/reactos/drivers/bus/pcix/init.c index ddf8b0507c3..2edf7c3d426 100644 --- a/reactos/drivers/bus/pcix/init.c +++ b/reactos/drivers/bus/pcix/init.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/agpintrf.c b/reactos/drivers/bus/pcix/intrface/agpintrf.c index 926d2919ccf..89c25ec0d2d 100644 --- a/reactos/drivers/bus/pcix/intrface/agpintrf.c +++ b/reactos/drivers/bus/pcix/intrface/agpintrf.c @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include + +#include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/busintrf.c b/reactos/drivers/bus/pcix/intrface/busintrf.c index de3566cab7e..93aecd322a8 100644 --- a/reactos/drivers/bus/pcix/intrface/busintrf.c +++ b/reactos/drivers/bus/pcix/intrface/busintrf.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/cardbus.c b/reactos/drivers/bus/pcix/intrface/cardbus.c index 03497700e3d..63c2ce6a27e 100644 --- a/reactos/drivers/bus/pcix/intrface/cardbus.c +++ b/reactos/drivers/bus/pcix/intrface/cardbus.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/devhere.c b/reactos/drivers/bus/pcix/intrface/devhere.c index fc6bd1190d4..9d2566cf055 100644 --- a/reactos/drivers/bus/pcix/intrface/devhere.c +++ b/reactos/drivers/bus/pcix/intrface/devhere.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/ideintrf.c b/reactos/drivers/bus/pcix/intrface/ideintrf.c index ec2ff82ee8e..b87fe5b97e4 100644 --- a/reactos/drivers/bus/pcix/intrface/ideintrf.c +++ b/reactos/drivers/bus/pcix/intrface/ideintrf.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/intrface.c b/reactos/drivers/bus/pcix/intrface/intrface.c index 47e78da586a..e430bd58e1f 100644 --- a/reactos/drivers/bus/pcix/intrface/intrface.c +++ b/reactos/drivers/bus/pcix/intrface/intrface.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/lddintrf.c b/reactos/drivers/bus/pcix/intrface/lddintrf.c index 0cf4362ac47..705c2c0a939 100644 --- a/reactos/drivers/bus/pcix/intrface/lddintrf.c +++ b/reactos/drivers/bus/pcix/intrface/lddintrf.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/locintrf.c b/reactos/drivers/bus/pcix/intrface/locintrf.c index 0e79874ac8c..236b2be8eb6 100644 --- a/reactos/drivers/bus/pcix/intrface/locintrf.c +++ b/reactos/drivers/bus/pcix/intrface/locintrf.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/pmeintf.c b/reactos/drivers/bus/pcix/intrface/pmeintf.c index ca440fd5b83..2a6346a42b1 100644 --- a/reactos/drivers/bus/pcix/intrface/pmeintf.c +++ b/reactos/drivers/bus/pcix/intrface/pmeintf.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/intrface/routintf.c b/reactos/drivers/bus/pcix/intrface/routintf.c index 67380bed7a4..e27b9bae855 100644 --- a/reactos/drivers/bus/pcix/intrface/routintf.c +++ b/reactos/drivers/bus/pcix/intrface/routintf.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/pci.h b/reactos/drivers/bus/pcix/pci.h index 25774f77454..b8cb9d07df3 100644 --- a/reactos/drivers/bus/pcix/pci.h +++ b/reactos/drivers/bus/pcix/pci.h @@ -6,18 +6,15 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#include #include -#include #include #include #include #include #include -#include "halfuncs.h" -#include "rtlfuncs.h" -#include "vffuncs.h" -#include "bugcodes.h" +#include +#include +#include // // 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 caf7632cd79..ec7fd12fd59 100644 --- a/reactos/drivers/bus/pcix/pci/busno.c +++ b/reactos/drivers/bus/pcix/pci/busno.c @@ -9,11 +9,10 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include -/* GLOBALS ********************************************************************/ - /* FUNCTIONS ******************************************************************/ BOOLEAN diff --git a/reactos/drivers/bus/pcix/pci/config.c b/reactos/drivers/bus/pcix/pci/config.c index 6d676dac8e4..bacd08162bc 100644 --- a/reactos/drivers/bus/pcix/pci/config.c +++ b/reactos/drivers/bus/pcix/pci/config.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/pci/devhere.c b/reactos/drivers/bus/pcix/pci/devhere.c index 4a666b9fefc..27f9b78b57d 100644 --- a/reactos/drivers/bus/pcix/pci/devhere.c +++ b/reactos/drivers/bus/pcix/pci/devhere.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/pci/id.c b/reactos/drivers/bus/pcix/pci/id.c index 929ad669a78..1a90a660b18 100644 --- a/reactos/drivers/bus/pcix/pci/id.c +++ b/reactos/drivers/bus/pcix/pci/id.c @@ -9,11 +9,10 @@ /* INCLUDES *******************************************************************/ #include +#include + #define NDEBUG #include -#include "stdio.h" - -/* GLOBALS ********************************************************************/ /* FUNCTIONS ******************************************************************/ diff --git a/reactos/drivers/bus/pcix/pci/ppbridge.c b/reactos/drivers/bus/pcix/pci/ppbridge.c index e988e1882c7..2d0303d98ee 100644 --- a/reactos/drivers/bus/pcix/pci/ppbridge.c +++ b/reactos/drivers/bus/pcix/pci/ppbridge.c @@ -9,11 +9,10 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include -/* GLOBALS ********************************************************************/ - /* FUNCTIONS ******************************************************************/ ULONG diff --git a/reactos/drivers/bus/pcix/pci/romimage.c b/reactos/drivers/bus/pcix/pci/romimage.c index 96575f39099..ce24e68add4 100644 --- a/reactos/drivers/bus/pcix/pci/romimage.c +++ b/reactos/drivers/bus/pcix/pci/romimage.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/pci/state.c b/reactos/drivers/bus/pcix/pci/state.c index 62191647452..a2be64c1e4e 100644 --- a/reactos/drivers/bus/pcix/pci/state.c +++ b/reactos/drivers/bus/pcix/pci/state.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/pcivrify.c b/reactos/drivers/bus/pcix/pcivrify.c index 69046a3f37b..2dce2ebd11a 100644 --- a/reactos/drivers/bus/pcix/pcivrify.c +++ b/reactos/drivers/bus/pcix/pcivrify.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/pdo.c b/reactos/drivers/bus/pcix/pdo.c index 80deec0af57..6946fcd9e8a 100644 --- a/reactos/drivers/bus/pcix/pdo.c +++ b/reactos/drivers/bus/pcix/pdo.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/power.c b/reactos/drivers/bus/pcix/power.c index 06fc80fe32a..efc29af0274 100644 --- a/reactos/drivers/bus/pcix/power.c +++ b/reactos/drivers/bus/pcix/power.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/usage.c b/reactos/drivers/bus/pcix/usage.c index b317439fc42..771850bf717 100644 --- a/reactos/drivers/bus/pcix/usage.c +++ b/reactos/drivers/bus/pcix/usage.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include diff --git a/reactos/drivers/bus/pcix/utils.c b/reactos/drivers/bus/pcix/utils.c index 86ad92e5532..df367d21456 100644 --- a/reactos/drivers/bus/pcix/utils.c +++ b/reactos/drivers/bus/pcix/utils.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include + #define NDEBUG #include