From 9a43c209d423dec04478715f856b6c671072104c Mon Sep 17 00:00:00 2001 From: Sir Richard Date: Tue, 9 Feb 2010 02:12:27 +0000 Subject: [PATCH] [NTOS]: All calls to DbgPrint will go to DbgPrintEarly for now. [NTOS]: More header fixes to match new definitions. svn path=/trunk/; revision=45514 --- reactos/ntoskrnl/include/internal/arm/ke.h | 9 +-------- reactos/ntoskrnl/include/internal/arm/mm.h | 2 ++ reactos/ntoskrnl/include/precomp.h | 5 +++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/reactos/ntoskrnl/include/internal/arm/ke.h b/reactos/ntoskrnl/include/internal/arm/ke.h index 964b63b7162..7bd1c6e161e 100644 --- a/reactos/ntoskrnl/include/internal/arm/ke.h +++ b/reactos/ntoskrnl/include/internal/arm/ke.h @@ -54,7 +54,7 @@ // All architectures but x86 have it in the PRCB's KeContextSwitches // #define KeGetContextSwitches(Prcb) \ - Prcb->KeContextSwitches + CONTAINING_RECORD(Prcb, KIPCR, PrcbData)->ContextSwitches // // Returns the Interrupt State from a Trap Frame. @@ -107,13 +107,6 @@ KiApcInterrupt( #include "mm.h" -VOID -KeFillFixedEntryTb( - IN ARM_PTE Pte, - IN PVOID Virtual, - IN ULONG Index -); - VOID KeFlushTb( VOID diff --git a/reactos/ntoskrnl/include/internal/arm/mm.h b/reactos/ntoskrnl/include/internal/arm/mm.h index f318d9a0fd9..4266f09c40e 100644 --- a/reactos/ntoskrnl/include/internal/arm/mm.h +++ b/reactos/ntoskrnl/include/internal/arm/mm.h @@ -27,6 +27,7 @@ #define PDE_BASE 0xC0400000 #define HYPER_SPACE 0xC0404000 +#if 0 typedef struct _HARDWARE_PDE_ARMV6 { ULONG Valid:1; // Only for small pages @@ -77,6 +78,7 @@ typedef struct _HARDWARE_PTE_ARMV6 C_ASSERT(sizeof(HARDWARE_PDE_ARMV6) == sizeof(ULONG)); C_ASSERT(sizeof(HARDWARE_LARGE_PTE_ARMV6) == sizeof(ULONG)); C_ASSERT(sizeof(HARDWARE_PTE_ARMV6) == sizeof(ULONG)); +#endif /* For FreeLDR */ typedef struct _PAGE_TABLE_ARM diff --git a/reactos/ntoskrnl/include/precomp.h b/reactos/ntoskrnl/include/precomp.h index 8974e9b526e..8948bae44f0 100644 --- a/reactos/ntoskrnl/include/precomp.h +++ b/reactos/ntoskrnl/include/precomp.h @@ -8,6 +8,11 @@ /* INCLUDES ******************************************************************/ +/* ARM Bringup Hack */ +#ifdef _M_ARM +#define DbgPrint DbgPrintEarly +#endif + /* Version Data */ #undef __MSVCRT__ #include