[ros-diffs] [ion] 20697: - Get MP hal and Generic HAL to build too.

- Get MP hal and Generic HAL to build too.
Modified: trunk/reactos/hal/hal/hal.c
Modified: trunk/reactos/hal/halx86/mp/apic.c
Modified: trunk/reactos/hal/halx86/mp/mps.S
Modified: trunk/reactos/hal/halx86/mp/mpsirql.c
Modified: trunk/reactos/hal/halx86/mp/spinlock.c
  _____  

Modified: trunk/reactos/hal/hal/hal.c
--- trunk/reactos/hal/hal/hal.c	2006-01-08 06:23:17 UTC (rev 20696)
+++ trunk/reactos/hal/hal/hal.c	2006-01-08 06:30:00 UTC (rev 20697)
@@ -126,7 +126,7 @@

 }
 
 
-VOID
+PVOID
 NTAPI
 HalAllocateCrashDumpRegisters(
   ULONG Unknown1,
  _____  

Modified: trunk/reactos/hal/halx86/mp/apic.c
--- trunk/reactos/hal/halx86/mp/apic.c	2006-01-08 06:23:17 UTC (rev
20696)
+++ trunk/reactos/hal/halx86/mp/apic.c	2006-01-08 06:30:00 UTC (rev
20697)
@@ -55,7 +55,8 @@

 ULONG lastvalw[MAX_CPU];
 
 #ifdef CONFIG_SMP
-typedef struct __attribute__((packed)) _COMMON_AREA_INFO
+#include <pshpack1.h>
+typedef struct _COMMON_AREA_INFO
 {
    ULONG Stack;		    /* Location of AP stack */
    ULONG PageDirectory;	    /* Page directory for an AP */
@@ -63,6 +64,7 @@
    ULONG PaeModeEnabled;    /* PAE mode is enabled */
    ULONG Debug[16];	    /* For debugging */
 } COMMON_AREA_INFO, *PCOMMON_AREA_INFO;
+#include <poppack.h>
 #endif
 
 CHAR *APstart, *APend;
@@ -73,15 +75,15 @@
 #define HZ		(100)
 #define APIC_DIVISOR	(16)
 
-#define CMOS_READ(address) ({ \
+#define CMOS_READ(address) { \
    WRITE_PORT_UCHAR((PUCHAR)0x70, address)); \
    READ_PORT_UCHAR((PUCHAR)0x71)); \
-})
+}
 
-#define CMOS_WRITE(address, value) ({ \
+#define CMOS_WRITE(address, value) { \
    WRITE_PORT_UCHAR((PUCHAR)0x70, address); \
    WRITE_PORT_UCHAR((PUCHAR)0x71, value); \
-})
+}
 
 extern ULONG_PTR KernelBase;
 
@@ -414,7 +416,8 @@
 
 BOOLEAN VerifyLocalAPIC(VOID)
 {
-   UINT reg0, reg1;
+   SIZE_T reg0, reg1;
+   ULONG l, h;
    /* The version register is read-only in a real APIC */
    reg0 = APICRead(APIC_VER);
    DPRINT1("Getting VERSION: %x\n", reg0);
@@ -461,7 +464,6 @@
       return FALSE;
    }
 
-   ULONG l, h;
    Ki386Rdmsr(0x1b /*MSR_IA32_APICBASE*/, l, h);
 
    if (!(l & /*MSR_IA32_APICBASE_ENABLE*/(1<<11))) 
  _____  

Modified: trunk/reactos/hal/halx86/mp/mps.S
--- trunk/reactos/hal/halx86/mp/mps.S	2006-01-08 06:23:17 UTC (rev
20696)
+++ trunk/reactos/hal/halx86/mp/mps.S	2006-01-08 06:30:00 UTC (rev
20697)
@@ -11,7 +11,7 @@

 
 /* INCLUDES
******************************************************************/
 
-#include <ndk/asm.h>
+#include <c:\programming\reactos\include\ndk/asm.h>
 
 /* FUNCTIONS
*****************************************************************/
 
  _____  

Modified: trunk/reactos/hal/halx86/mp/mpsirql.c
--- trunk/reactos/hal/halx86/mp/mpsirql.c	2006-01-08 06:23:17 UTC
(rev 20696)
+++ trunk/reactos/hal/halx86/mp/mpsirql.c	2006-01-08 06:30:00 UTC
(rev 20697)
@@ -69,7 +69,7 @@

 }
 
 VOID 
-HalpLowerIrql(KIRQL NewIrql, BOOL FromHalEndSystemInterrupt)
+HalpLowerIrql(KIRQL NewIrql, BOOLEAN FromHalEndSystemInterrupt)
 {
   ULONG Flags;
   UCHAR DpcRequested;
  _____  

Modified: trunk/reactos/hal/halx86/mp/spinlock.c
--- trunk/reactos/hal/halx86/mp/spinlock.c	2006-01-08 06:23:17 UTC
(rev 20696)
+++ trunk/reactos/hal/halx86/mp/spinlock.c	2006-01-08 06:30:00 UTC
(rev 20697)
@@ -49,7 +49,7 @@

 {
   KIRQL OldIrql;
 
-  OldIrql = KfRaiseIrql(SYNCH_LEVEL);
+  OldIrql = KfRaiseIrql(CLOCK2_LEVEL);
   KiAcquireSpinLock(SpinLock);
 
   return OldIrql;