From 3e334c65fcda3ce95a9b22ce81b1cc1fd9d74b5c Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sat, 18 Jun 2005 14:28:28 +0000 Subject: [PATCH] Build MP HAL with w32api svn path=/trunk/; revision=16036 --- reactos/hal/halx86/mp/apic.c | 17 ++++------------- reactos/hal/halx86/mp/halinit_mp.c | 6 +----- reactos/hal/halx86/mp/halmp.xml | 3 ++- reactos/hal/halx86/mp/ioapic.c | 15 +-------------- reactos/hal/halx86/mp/ipi_mp.c | 6 +----- reactos/hal/halx86/mp/mpconfig.c | 9 +-------- reactos/hal/halx86/mp/mpsirql.c | 27 +++++++++------------------ reactos/hal/halx86/mp/processor_mp.c | 17 +---------------- reactos/hal/halx86/mp/resource_mp.c | 5 +---- 9 files changed, 21 insertions(+), 84 deletions(-) diff --git a/reactos/hal/halx86/mp/apic.c b/reactos/hal/halx86/mp/apic.c index f6efcb40371..77c4bc1d897 100644 --- a/reactos/hal/halx86/mp/apic.c +++ b/reactos/hal/halx86/mp/apic.c @@ -27,16 +27,9 @@ /* INCLUDE ***********************************************************************/ -#include -#include - -#include -#include -#include -#include - #define NDEBUG -#include +#include +#include /* GLOBALS ***********************************************************************/ @@ -89,8 +82,6 @@ CHAR *APstart, *APend; WRITE_PORT_UCHAR((PUCHAR)0x71, value); \ }) -extern PVOID IMPORTED MmSystemRangeStart; - /* FUNCTIONS *********************************************************************/ extern ULONG Read8254Timer(VOID); @@ -866,7 +857,7 @@ APICCalibrateTimer(ULONG CPU) APICSetupLVTT(1000000000); - TSCPresent = KeGetCurrentKPCR()->PrcbData.FeatureBits & X86_FEATURE_TSC ? TRUE : FALSE; + TSCPresent = ((PKIPCR)KeGetCurrentKPCR())->PrcbData.FeatureBits & X86_FEATURE_TSC ? TRUE : FALSE; /* * The timer chip counts down to zero. Let's wait @@ -895,7 +886,7 @@ APICCalibrateTimer(ULONG CPU) DPRINT("CPU clock speed is %ld.%04ld MHz.\n", CPUMap[CPU].CoreSpeed/1000000, CPUMap[CPU].CoreSpeed%1000000); - KeGetCurrentKPCR()->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; + ((PKIPCR)KeGetCurrentKPCR())->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; } CPUMap[CPU].BusSpeed = (HZ * (long)(tt1 - tt2) * APIC_DIVISOR); diff --git a/reactos/hal/halx86/mp/halinit_mp.c b/reactos/hal/halx86/mp/halinit_mp.c index 0501f5decea..32a86aefb67 100644 --- a/reactos/hal/halx86/mp/halinit_mp.c +++ b/reactos/hal/halx86/mp/halinit_mp.c @@ -11,12 +11,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include - #define NDEBUG -#include +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/hal/halx86/mp/halmp.xml b/reactos/hal/halx86/mp/halmp.xml index 6d1cb4aa4ea..11dc3d0d4ca 100644 --- a/reactos/hal/halx86/mp/halmp.xml +++ b/reactos/hal/halx86/mp/halmp.xml @@ -4,7 +4,8 @@ include - + + hal_generic hal_generic_pc ntoskrnl diff --git a/reactos/hal/halx86/mp/ioapic.c b/reactos/hal/halx86/mp/ioapic.c index 9b0a6241ba3..9fef8f2c588 100644 --- a/reactos/hal/halx86/mp/ioapic.c +++ b/reactos/hal/halx86/mp/ioapic.c @@ -9,21 +9,8 @@ /* INCLUDES *****************************************************************/ -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - #define NDEBUG -#include +#include /* GLOBALS *****************************************************************/ diff --git a/reactos/hal/halx86/mp/ipi_mp.c b/reactos/hal/halx86/mp/ipi_mp.c index 120b7c93fbe..34f0108dc41 100644 --- a/reactos/hal/halx86/mp/ipi_mp.c +++ b/reactos/hal/halx86/mp/ipi_mp.c @@ -9,12 +9,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include - #define NDEBUG -#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/hal/halx86/mp/mpconfig.c b/reactos/hal/halx86/mp/mpconfig.c index fe1bb3e8904..453ea1e206d 100644 --- a/reactos/hal/halx86/mp/mpconfig.c +++ b/reactos/hal/halx86/mp/mpconfig.c @@ -9,15 +9,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include -#include -#include - #define NDEBUG -#include +#include /* GLOBALS ******************************************************************/ diff --git a/reactos/hal/halx86/mp/mpsirql.c b/reactos/hal/halx86/mp/mpsirql.c index f25f40d7c0b..ff856ec5c45 100644 --- a/reactos/hal/halx86/mp/mpsirql.c +++ b/reactos/hal/halx86/mp/mpsirql.c @@ -11,18 +11,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include - #define NDEBUG -#include +#include /* GLOBALS ******************************************************************/; @@ -42,7 +32,7 @@ KIRQL STDCALL KeGetCurrentIrql (VOID) Ki386SaveFlags(Flags); Ki386DisableInterrupts(); - irql = Ki386ReadFsByte(offsetof(KPCR, Irql)); + irql = Ki386ReadFsByte(FIELD_OFFSET(KPCR, Irql)); if (irql > HIGH_LEVEL) { DPRINT1 ("CurrentIrql %x\n", irql); @@ -70,7 +60,7 @@ VOID KeSetCurrentIrql (KIRQL NewIrql) } Ki386SaveFlags(Flags); Ki386DisableInterrupts(); - Ki386WriteFsByte(offsetof(KPCR, Irql), NewIrql); + Ki386WriteFsByte(FIELD_OFFSET(KPCR, Irql), NewIrql); if (Flags & X86_EFLAGS_IF) { Ki386EnableInterrupts(); @@ -92,9 +82,9 @@ HalpLowerIrql(KIRQL NewIrql, BOOL FromHalEndSystemInterrupt) { KeSetCurrentIrql (DISPATCH_LEVEL); APICWrite(APIC_TPR, IRQL2TPR (DISPATCH_LEVEL) & APIC_TPR_PRI); - if (FromHalEndSystemInterrupt || Ki386ReadFsByte(offsetof(KPCR, HalReserved[HAL_DPC_REQUEST]))) + if (FromHalEndSystemInterrupt || Ki386ReadFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]))) { - Ki386WriteFsByte(offsetof(KPCR, HalReserved[HAL_DPC_REQUEST]), 0); + Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 0); Ki386EnableInterrupts(); KiDispatchInterrupt(); if (!(Flags & X86_EFLAGS_IF)) @@ -166,7 +156,7 @@ KfLowerIrql (KIRQL NewIrql) * * NOTES */ - +#undef KeLowerIrql VOID STDCALL KeLowerIrql (KIRQL NewIrql) { @@ -240,6 +230,7 @@ KfRaiseIrql (KIRQL NewIrql) * NOTES * Calls KfRaiseIrql */ +#undef KeRaiseIrql VOID STDCALL KeRaiseIrql (KIRQL NewIrql, PKIRQL OldIrql) @@ -392,11 +383,11 @@ HalRequestSoftwareInterrupt(IN KIRQL Request) switch (Request) { case APC_LEVEL: - Ki386WriteFsByte(offsetof(KPCR, HalReserved[HAL_APC_REQUEST]), 1); + Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_APC_REQUEST]), 1); break; case DISPATCH_LEVEL: - Ki386WriteFsByte(offsetof(KPCR, HalReserved[HAL_DPC_REQUEST]), 1); + Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 1); break; default: diff --git a/reactos/hal/halx86/mp/processor_mp.c b/reactos/hal/halx86/mp/processor_mp.c index 861647d6120..0e0493d01f2 100644 --- a/reactos/hal/halx86/mp/processor_mp.c +++ b/reactos/hal/halx86/mp/processor_mp.c @@ -14,23 +14,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - #define NDEBUG -#include - - +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/hal/halx86/mp/resource_mp.c b/reactos/hal/halx86/mp/resource_mp.c index 53164e5f155..e5d38ca52cb 100644 --- a/reactos/hal/halx86/mp/resource_mp.c +++ b/reactos/hal/halx86/mp/resource_mp.c @@ -9,11 +9,8 @@ /* INCLUDES *****************************************************************/ -#include -#include - #define NDEBUG -#include +#include /* FUNCTIONS ****************************************************************/