From 16c356bfa1870f2e327fd38674f971847cd5ac3b Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sun, 19 Jun 2005 22:53:49 +0000 Subject: [PATCH] Ditto for HAL svn path=/trunk/; revision=16127 --- reactos/hal/hal/hal.c | 3 ++- reactos/hal/halx86/generic/adapter.c | 3 ++- reactos/hal/halx86/generic/beep.c | 3 ++- reactos/hal/halx86/generic/bus.c | 3 ++- reactos/hal/halx86/generic/display.c | 3 ++- reactos/hal/halx86/generic/dma.c | 3 ++- reactos/hal/halx86/generic/drive.c | 3 ++- reactos/hal/halx86/generic/enum.c | 3 ++- reactos/hal/halx86/generic/fmutex.c | 3 ++- reactos/hal/halx86/generic/halinit.c | 3 ++- reactos/hal/halx86/generic/ipi.c | 3 ++- reactos/hal/halx86/generic/irql.c | 3 ++- reactos/hal/halx86/generic/isa.c | 3 ++- reactos/hal/halx86/generic/kdbg.c | 3 ++- reactos/hal/halx86/generic/mca.c | 3 ++- reactos/hal/halx86/generic/misc.c | 3 ++- reactos/hal/halx86/generic/pci.c | 3 ++- reactos/hal/halx86/generic/portio.c | 3 ++- reactos/hal/halx86/generic/processor.c | 3 ++- reactos/hal/halx86/generic/reboot.c | 3 ++- reactos/hal/halx86/generic/resource.c | 3 ++- reactos/hal/halx86/generic/spinlock.c | 3 ++- reactos/hal/halx86/generic/sysbus.c | 3 ++- reactos/hal/halx86/generic/sysinfo.c | 3 ++- reactos/hal/halx86/generic/time.c | 3 ++- reactos/hal/halx86/generic/timer.c | 3 ++- reactos/hal/halx86/include/hal.h | 3 --- reactos/hal/halx86/mp/apic.c | 3 ++- reactos/hal/halx86/mp/halinit_mp.c | 3 ++- reactos/hal/halx86/mp/ioapic.c | 3 ++- reactos/hal/halx86/mp/ipi_mp.c | 3 ++- reactos/hal/halx86/mp/mpconfig.c | 3 ++- reactos/hal/halx86/mp/mpsirql.c | 3 ++- reactos/hal/halx86/mp/processor_mp.c | 3 ++- reactos/hal/halx86/mp/resource_mp.c | 3 ++- reactos/hal/halx86/up/halinit_up.c | 3 ++- reactos/hal/halx86/xbox/font.c | 3 ++- reactos/hal/halx86/xbox/halinit_xbox.c | 3 ++- reactos/hal/halx86/xbox/halxbox.xml | 2 +- reactos/hal/halx86/xbox/part_xbox.c | 3 ++- reactos/hal/halx86/xbox/pci_xbox.c | 3 ++- 41 files changed, 79 insertions(+), 43 deletions(-) diff --git a/reactos/hal/hal/hal.c b/reactos/hal/hal/hal.c index 52a5dc8607b..73ebe989c96 100644 --- a/reactos/hal/hal/hal.c +++ b/reactos/hal/hal/hal.c @@ -14,8 +14,9 @@ #include #include -#define NDEBUG #include +#define NDEBUG +#include typedef struct _LOADER_PARAMETER_BLOCK *PLOADER_PARAMETER_BLOCK; typedef struct _KD_PORT_INFORMATION *PKD_PORT_INFORMATION; diff --git a/reactos/hal/halx86/generic/adapter.c b/reactos/hal/halx86/generic/adapter.c index 1832b726f70..bc1a8c6799a 100644 --- a/reactos/hal/halx86/generic/adapter.c +++ b/reactos/hal/halx86/generic/adapter.c @@ -13,8 +13,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* Hmm, needed for KDBG := 1. Why? */ extern POBJECT_TYPE IMPORTED IoAdapterObjectType; diff --git a/reactos/hal/halx86/generic/beep.c b/reactos/hal/halx86/generic/beep.c index ea1bec54dda..70b36805b23 100644 --- a/reactos/hal/halx86/generic/beep.c +++ b/reactos/hal/halx86/generic/beep.c @@ -10,8 +10,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* CONSTANTS *****************************************************************/ diff --git a/reactos/hal/halx86/generic/bus.c b/reactos/hal/halx86/generic/bus.c index 19e7939d0e9..be2f7664397 100644 --- a/reactos/hal/halx86/generic/bus.c +++ b/reactos/hal/halx86/generic/bus.c @@ -15,8 +15,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* GLOBALS *******************************************************************/ diff --git a/reactos/hal/halx86/generic/display.c b/reactos/hal/halx86/generic/display.c index 46d2fd06a67..48e3f44938e 100644 --- a/reactos/hal/halx86/generic/display.c +++ b/reactos/hal/halx86/generic/display.c @@ -121,8 +121,9 @@ * since there is already support for them via the VideoPortInt10 routine. */ -#define NDEBUG #include +#define NDEBUG +#include #define SCREEN_SYNCHRONIZATION diff --git a/reactos/hal/halx86/generic/dma.c b/reactos/hal/halx86/generic/dma.c index 8b0f63fb262..7abee565652 100644 --- a/reactos/hal/halx86/generic/dma.c +++ b/reactos/hal/halx86/generic/dma.c @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* Adapters for each channel */ PADAPTER_OBJECT HalpEisaAdapter[8]; diff --git a/reactos/hal/halx86/generic/drive.c b/reactos/hal/halx86/generic/drive.c index bc1f1613e48..fade4374d01 100644 --- a/reactos/hal/halx86/generic/drive.c +++ b/reactos/hal/halx86/generic/drive.c @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/hal/halx86/generic/enum.c b/reactos/hal/halx86/generic/enum.c index 185110d4a1c..4d9e1e0d13c 100644 --- a/reactos/hal/halx86/generic/enum.c +++ b/reactos/hal/halx86/generic/enum.c @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include VOID HalpStartEnumerator (VOID) diff --git a/reactos/hal/halx86/generic/fmutex.c b/reactos/hal/halx86/generic/fmutex.c index 5c469103add..ccfdcfd904b 100644 --- a/reactos/hal/halx86/generic/fmutex.c +++ b/reactos/hal/halx86/generic/fmutex.c @@ -12,8 +12,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/hal/halx86/generic/halinit.c b/reactos/hal/halx86/generic/halinit.c index 335f0401db8..64c85798174 100644 --- a/reactos/hal/halx86/generic/halinit.c +++ b/reactos/hal/halx86/generic/halinit.c @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* GLOBALS *****************************************************************/ diff --git a/reactos/hal/halx86/generic/ipi.c b/reactos/hal/halx86/generic/ipi.c index 4b34f518106..fb372b2c4b5 100644 --- a/reactos/hal/halx86/generic/ipi.c +++ b/reactos/hal/halx86/generic/ipi.c @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/generic/irql.c b/reactos/hal/halx86/generic/irql.c index 2b07a91a2e5..dc66dc83116 100644 --- a/reactos/hal/halx86/generic/irql.c +++ b/reactos/hal/halx86/generic/irql.c @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* GLOBALS ******************************************************************/ diff --git a/reactos/hal/halx86/generic/isa.c b/reactos/hal/halx86/generic/isa.c index 441cd769ab2..91bfdf826cf 100644 --- a/reactos/hal/halx86/generic/isa.c +++ b/reactos/hal/halx86/generic/isa.c @@ -11,8 +11,9 @@ /* INCLUDES ***************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/hal/halx86/generic/kdbg.c b/reactos/hal/halx86/generic/kdbg.c index ca75dc24b6c..0c2fec85233 100644 --- a/reactos/hal/halx86/generic/kdbg.c +++ b/reactos/hal/halx86/generic/kdbg.c @@ -12,8 +12,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include #define DEFAULT_BAUD_RATE 19200 diff --git a/reactos/hal/halx86/generic/mca.c b/reactos/hal/halx86/generic/mca.c index 2999a6316bc..f07dca211cd 100644 --- a/reactos/hal/halx86/generic/mca.c +++ b/reactos/hal/halx86/generic/mca.c @@ -32,8 +32,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/generic/misc.c b/reactos/hal/halx86/generic/misc.c index bddc05c6ea7..227479f9f85 100644 --- a/reactos/hal/halx86/generic/misc.c +++ b/reactos/hal/halx86/generic/misc.c @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/generic/pci.c b/reactos/hal/halx86/generic/pci.c index 93307dfe6e6..8b0626fe384 100644 --- a/reactos/hal/halx86/generic/pci.c +++ b/reactos/hal/halx86/generic/pci.c @@ -18,8 +18,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* MACROS ******************************************************************/ diff --git a/reactos/hal/halx86/generic/portio.c b/reactos/hal/halx86/generic/portio.c index 20f647353ee..2dfe77fe7f4 100644 --- a/reactos/hal/halx86/generic/portio.c +++ b/reactos/hal/halx86/generic/portio.c @@ -9,8 +9,9 @@ * Created 18/10/99 */ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/generic/processor.c b/reactos/hal/halx86/generic/processor.c index 168a2fb5ff6..2ebabfc7e11 100644 --- a/reactos/hal/halx86/generic/processor.c +++ b/reactos/hal/halx86/generic/processor.c @@ -14,8 +14,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/hal/halx86/generic/reboot.c b/reactos/hal/halx86/generic/reboot.c index 4e07b2c7d44..9f03f9e0579 100644 --- a/reactos/hal/halx86/generic/reboot.c +++ b/reactos/hal/halx86/generic/reboot.c @@ -9,8 +9,9 @@ * Created 11/10/99 */ -#define NDEBUG #include +#define NDEBUG +#include static VOID diff --git a/reactos/hal/halx86/generic/resource.c b/reactos/hal/halx86/generic/resource.c index f473911e05b..a86c531081b 100644 --- a/reactos/hal/halx86/generic/resource.c +++ b/reactos/hal/halx86/generic/resource.c @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/generic/spinlock.c b/reactos/hal/halx86/generic/spinlock.c index 9a5a9f7961c..d1d3d7e4bb1 100644 --- a/reactos/hal/halx86/generic/spinlock.c +++ b/reactos/hal/halx86/generic/spinlock.c @@ -17,8 +17,9 @@ /* INCLUDES ****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* Hmm, needed for KDBG := 1. Why? */ #undef KeGetCurrentIrql diff --git a/reactos/hal/halx86/generic/sysbus.c b/reactos/hal/halx86/generic/sysbus.c index 1e14ce0f9ab..4e01c3f0131 100644 --- a/reactos/hal/halx86/generic/sysbus.c +++ b/reactos/hal/halx86/generic/sysbus.c @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/generic/sysinfo.c b/reactos/hal/halx86/generic/sysinfo.c index 15c36145b65..a5ccfeb1be7 100644 --- a/reactos/hal/halx86/generic/sysinfo.c +++ b/reactos/hal/halx86/generic/sysinfo.c @@ -10,8 +10,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include diff --git a/reactos/hal/halx86/generic/time.c b/reactos/hal/halx86/generic/time.c index 9b6e22946bf..d6d5d7a3fca 100644 --- a/reactos/hal/halx86/generic/time.c +++ b/reactos/hal/halx86/generic/time.c @@ -8,8 +8,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* MACROS and CONSTANTS ******************************************************/ diff --git a/reactos/hal/halx86/generic/timer.c b/reactos/hal/halx86/generic/timer.c index 7973bd5a36a..0e9ab1ebfc4 100644 --- a/reactos/hal/halx86/generic/timer.c +++ b/reactos/hal/halx86/generic/timer.c @@ -32,8 +32,9 @@ /* INCLUDES ***************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* GLOBALS ******************************************************************/ diff --git a/reactos/hal/halx86/include/hal.h b/reactos/hal/halx86/include/hal.h index 9855ca8ef02..1fbd3ef2c9e 100644 --- a/reactos/hal/halx86/include/hal.h +++ b/reactos/hal/halx86/include/hal.h @@ -50,9 +50,6 @@ ObCreateObject ( OUT PVOID *Object ); -/* Debug Header */ -#include - /* Internal HAL Headers */ #include "apic.h" #include "bus.h" diff --git a/reactos/hal/halx86/mp/apic.c b/reactos/hal/halx86/mp/apic.c index 77c4bc1d897..093419cc2e5 100644 --- a/reactos/hal/halx86/mp/apic.c +++ b/reactos/hal/halx86/mp/apic.c @@ -27,8 +27,9 @@ /* INCLUDE ***********************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include #include /* GLOBALS ***********************************************************************/ diff --git a/reactos/hal/halx86/mp/halinit_mp.c b/reactos/hal/halx86/mp/halinit_mp.c index 32a86aefb67..87871bbedeb 100644 --- a/reactos/hal/halx86/mp/halinit_mp.c +++ b/reactos/hal/halx86/mp/halinit_mp.c @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/hal/halx86/mp/ioapic.c b/reactos/hal/halx86/mp/ioapic.c index 9fef8f2c588..af1b39c5cb9 100644 --- a/reactos/hal/halx86/mp/ioapic.c +++ b/reactos/hal/halx86/mp/ioapic.c @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* GLOBALS *****************************************************************/ diff --git a/reactos/hal/halx86/mp/ipi_mp.c b/reactos/hal/halx86/mp/ipi_mp.c index 34f0108dc41..6451e8297ca 100644 --- a/reactos/hal/halx86/mp/ipi_mp.c +++ b/reactos/hal/halx86/mp/ipi_mp.c @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/mp/mpconfig.c b/reactos/hal/halx86/mp/mpconfig.c index 453ea1e206d..9911e365949 100644 --- a/reactos/hal/halx86/mp/mpconfig.c +++ b/reactos/hal/halx86/mp/mpconfig.c @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* GLOBALS ******************************************************************/ diff --git a/reactos/hal/halx86/mp/mpsirql.c b/reactos/hal/halx86/mp/mpsirql.c index ff856ec5c45..c2051e18f9b 100644 --- a/reactos/hal/halx86/mp/mpsirql.c +++ b/reactos/hal/halx86/mp/mpsirql.c @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* GLOBALS ******************************************************************/; diff --git a/reactos/hal/halx86/mp/processor_mp.c b/reactos/hal/halx86/mp/processor_mp.c index 0e0493d01f2..a8ea3f87575 100644 --- a/reactos/hal/halx86/mp/processor_mp.c +++ b/reactos/hal/halx86/mp/processor_mp.c @@ -14,8 +14,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/hal/halx86/mp/resource_mp.c b/reactos/hal/halx86/mp/resource_mp.c index e5d38ca52cb..ee39606d763 100644 --- a/reactos/hal/halx86/mp/resource_mp.c +++ b/reactos/hal/halx86/mp/resource_mp.c @@ -9,8 +9,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/up/halinit_up.c b/reactos/hal/halx86/up/halinit_up.c index 33043d6193d..3ad08c1fbd9 100644 --- a/reactos/hal/halx86/up/halinit_up.c +++ b/reactos/hal/halx86/up/halinit_up.c @@ -11,8 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/hal/halx86/xbox/font.c b/reactos/hal/halx86/xbox/font.c index 10c7c4cbfdc..b58f3b02ed3 100644 --- a/reactos/hal/halx86/xbox/font.c +++ b/reactos/hal/halx86/xbox/font.c @@ -14,8 +14,9 @@ #include #include "halxbox.h" -#define NDEBUG #include +#define NDEBUG +#include BYTE XboxFont8x16[256 * 16] = { diff --git a/reactos/hal/halx86/xbox/halinit_xbox.c b/reactos/hal/halx86/xbox/halinit_xbox.c index 0479db7d6f7..e7720e294e1 100644 --- a/reactos/hal/halx86/xbox/halinit_xbox.c +++ b/reactos/hal/halx86/xbox/halinit_xbox.c @@ -15,8 +15,9 @@ #include #include "halxbox.h" -#define NDEBUG #include +#define NDEBUG +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/hal/halx86/xbox/halxbox.xml b/reactos/hal/halx86/xbox/halxbox.xml index e24fe194332..f101eee7d07 100644 --- a/reactos/hal/halx86/xbox/halxbox.xml +++ b/reactos/hal/halx86/xbox/halxbox.xml @@ -1,4 +1,4 @@ - + ../include include diff --git a/reactos/hal/halx86/xbox/part_xbox.c b/reactos/hal/halx86/xbox/part_xbox.c index bafb1fe0b31..f5a32d3f09a 100644 --- a/reactos/hal/halx86/xbox/part_xbox.c +++ b/reactos/hal/halx86/xbox/part_xbox.c @@ -15,8 +15,9 @@ #include #include "halxbox.h" -#define NDEBUG #include +#define NDEBUG +#include #define XBOX_SIGNATURE_SECTOR 3 #define XBOX_SIGNATURE ('B' | ('R' << 8) | ('F' << 16) | ('R' << 24)) diff --git a/reactos/hal/halx86/xbox/pci_xbox.c b/reactos/hal/halx86/xbox/pci_xbox.c index f156e90b359..badbe5381bb 100644 --- a/reactos/hal/halx86/xbox/pci_xbox.c +++ b/reactos/hal/halx86/xbox/pci_xbox.c @@ -22,8 +22,9 @@ #include #include "halxbox.h" -#define NDEBUG #include +#define NDEBUG +#include /* VARIABLES ***************************************************************/