A couple of header fixes to get all the FreeLDR-loaded boot drivers to compile and...

FreeLDR now stops at ArmPrepareForReactOS, when we get to enable the MMU, Caches and other such fun stuff.
Bring-up now really starts!

svn path=/trunk/; revision=32233

diff --git a/reactos/include/ddk/ndis.h b/reactos/include/ddk/ndis.h
index d34ca92..baf39ef 100644 (file)
--- a/reactos/include/ddk/ndis.h
+++ b/reactos/include/ddk/ndis.h
@@ -2285,7 +2285,7 @@ NdisDestroyLookaheadBufferFromSharedMemory(
 
 #endif
 
-#if defined(_M_IX86) || defined(_M_AMD64)
+#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM)
 
 /*
  * VOID

diff --git a/reactos/include/ndk/arm/ketypes.h b/reactos/include/ndk/arm/ketypes.h
index 6f64e48..9ab0e53 100644 (file)
--- a/reactos/include/ndk/arm/ketypes.h
+++ b/reactos/include/ndk/arm/ketypes.h
@@ -230,16 +230,5 @@ KeGetCurrentPrcb(VOID)
     return PCR->Prcb;
 }
 
-//
-// Macro to get current CPU
-//
-FORCEINLINE
-ULONG
-DDKAPI
-KeGetCurrentProcessorNumber(VOID)
-{
-    return PCR->Number;
-}
-
 #endif
 #endif

diff --git a/reactos/include/reactos/armddk.h b/reactos/include/reactos/armddk.h
index 53c3ee2..8775eff 100644 (file)
--- a/reactos/include/reactos/armddk.h
+++ b/reactos/include/reactos/armddk.h
@@ -22,6 +22,11 @@
 #define PCR                     ((volatile KPCR * const)USPCR)
 #define USERPCR                 ((volatile KPCR * const)KIPCR)
 
+//
+// Just read it from the PCR
+//
+#define KeGetCurrentProcessorNumber() ((ULONG)(PCR->Number))
+
 //
 // Stub
 //