Build MP HAL with w32api

svn path=/trunk/; revision=16036

diff --git a/reactos/hal/halx86/mp/apic.c b/reactos/hal/halx86/mp/apic.c
index f6efcb4..77c4bc1 100644 (file)
--- a/reactos/hal/halx86/mp/apic.c
+++ b/reactos/hal/halx86/mp/apic.c
@@ -27,16 +27,9 @@
 
 /* INCLUDE ***********************************************************************/
 
-#include <ddk/ntddk.h>
-#include <internal/i386/ps.h>
-
-#include <hal.h>
-#include <halirq.h>
-#include <mps.h>
-#include <apic.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
+#include <internal/ntoskrnl.h>
 
 /* 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 0501f5d..32a86ae 100644 (file)
--- a/reactos/hal/halx86/mp/halinit_mp.c
+++ b/reactos/hal/halx86/mp/halinit_mp.c
@@ -11,12 +11,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-#include <mps.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* FUNCTIONS ***************************************************************/
 

diff --git a/reactos/hal/halx86/mp/halmp.xml b/reactos/hal/halx86/mp/halmp.xml
index 6d1cb4a..11dc3d0 100644 (file)
--- a/reactos/hal/halx86/mp/halmp.xml
+++ b/reactos/hal/halx86/mp/halmp.xml
@@ -4,7 +4,8 @@
        <include base="ntoskrnl">include</include>\r
        <define name="_DISABLE_TIDENTS" />\r
        <define name="CONFIG_SMP" />\r
-       <define name="__NTHAL__" />\r
+       <define name="_NTHAL_" />\r
+       <define name="__USE_W32API" />\r
        <library>hal_generic</library>\r
        <library>hal_generic_pc</library>\r
        <library>ntoskrnl</library>\r

diff --git a/reactos/hal/halx86/mp/ioapic.c b/reactos/hal/halx86/mp/ioapic.c
index 9b0a624..9fef8f2 100644 (file)
--- a/reactos/hal/halx86/mp/ioapic.c
+++ b/reactos/hal/halx86/mp/ioapic.c
@@ -9,21 +9,8 @@
 \r
 /* INCLUDES *****************************************************************/\r
 \r
-#include <ddk/ntddk.h>\r
-#include <hal.h>\r
-\r
-#include <mps.h>\r
-#include <halirq.h>\r
-#include <apic.h>\r
-#include <ioapic.h>\r
-\r
-#include <internal/ntoskrnl.h>\r
-#include <internal/i386/segment.h>\r
-#include <internal/ke.h>\r
-#include <internal/ps.h>\r
-\r
 #define NDEBUG\r
-#include <internal/debug.h>\r
+#include <hal.h>\r
 \r
 /* GLOBALS *****************************************************************/\r
 \r

diff --git a/reactos/hal/halx86/mp/ipi_mp.c b/reactos/hal/halx86/mp/ipi_mp.c
index 120b7c9..34f0108 100644 (file)
--- a/reactos/hal/halx86/mp/ipi_mp.c
+++ b/reactos/hal/halx86/mp/ipi_mp.c
@@ -9,12 +9,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-#include <apic.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* FUNCTIONS ****************************************************************/
 

diff --git a/reactos/hal/halx86/mp/mpconfig.c b/reactos/hal/halx86/mp/mpconfig.c
index fe1bb3e..453ea1e 100644 (file)
--- a/reactos/hal/halx86/mp/mpconfig.c
+++ b/reactos/hal/halx86/mp/mpconfig.c
@@ -9,15 +9,8 @@
 \r
 /* INCLUDES *****************************************************************/\r
 \r
-#include <ddk/ntddk.h>\r
-#include <ntos/types.h>\r
-#include <hal.h>\r
-#include <mps.h>\r
-#include <apic.h>\r
-#include <ioapic.h>\r
-\r
 #define NDEBUG\r
-#include <internal/debug.h>\r
+#include <hal.h>\r
 \r
 /* GLOBALS ******************************************************************/\r
 \r

diff --git a/reactos/hal/halx86/mp/mpsirql.c b/reactos/hal/halx86/mp/mpsirql.c
index f25f40d..ff856ec 100644 (file)
--- a/reactos/hal/halx86/mp/mpsirql.c
+++ b/reactos/hal/halx86/mp/mpsirql.c
@@ -11,18 +11,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <internal/ke.h>
-#include <internal/ps.h>
-#include <ntos/minmax.h>
-#include <halirq.h>
-#include <hal.h>
-#include <mps.h>
-#include <apic.h>
-#include <ioapic.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* 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 861647d..0e0493d 100644 (file)
--- a/reactos/hal/halx86/mp/processor_mp.c
+++ b/reactos/hal/halx86/mp/processor_mp.c
@@ -14,23 +14,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-#include <halirq.h>
-#include <mps.h>
-
-#include <ioapic.h>
-#include <apic.h>
-
-#include <internal/ntoskrnl.h>
-#include <internal/i386/segment.h>
-#include <internal/ke.h>
-#include <internal/ps.h>
-
 #define NDEBUG
-#include <internal/debug.h>
-
-
+#include <hal.h>
 
 /* FUNCTIONS *****************************************************************/
 

diff --git a/reactos/hal/halx86/mp/resource_mp.c b/reactos/hal/halx86/mp/resource_mp.c
index 53164e5..e5d38ca 100644 (file)
--- a/reactos/hal/halx86/mp/resource_mp.c
+++ b/reactos/hal/halx86/mp/resource_mp.c
@@ -9,11 +9,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* FUNCTIONS ****************************************************************/