Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 05:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Get MP hal and Generic HAL to build too.

Browse source 
svn path=/trunk/; revision=20697
This commit is contained in:
Alex Ionescu 2006-01-08 06:30:00 +00:00
parent 9c52bdbe04
commit 9afb713356
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/hal/hal/hal.c
View file

@ -126,7 +126,7 @@ HalAllocateCommonBuffer(
} }
VOID PVOID
NTAPI NTAPI
HalAllocateCrashDumpRegisters( HalAllocateCrashDumpRegisters(
ULONG Unknown1, ULONG Unknown1,

16
reactos/hal/halx86/mp/apic.c
View file

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

2
reactos/hal/halx86/mp/mps.S
View file

@ -11,7 +11,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ndk/asm.h> #include <c:\programming\reactos\include\ndk/asm.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

2
reactos/hal/halx86/mp/mpsirql.c
View file

@ -69,7 +69,7 @@ VOID KeSetCurrentIrql (KIRQL NewIrql)
} }
VOID VOID
HalpLowerIrql(KIRQL NewIrql, BOOL FromHalEndSystemInterrupt) HalpLowerIrql(KIRQL NewIrql, BOOLEAN FromHalEndSystemInterrupt)
{ {
ULONG Flags; ULONG Flags;
UCHAR DpcRequested; UCHAR DpcRequested;

2
reactos/hal/halx86/mp/spinlock.c
View file

@ -49,7 +49,7 @@ KeAcquireSpinLockRaiseToSynch (
{ {
KIRQL OldIrql; KIRQL OldIrql;
OldIrql = KfRaiseIrql(SYNCH_LEVEL); OldIrql = KfRaiseIrql(CLOCK2_LEVEL);
KiAcquireSpinLock(SpinLock); KiAcquireSpinLock(SpinLock);
return OldIrql; return OldIrql;