[ros-diffs] [ros-arm-bringup] 32233: A couple of header fixes to get all the FreeLDR-loaded boot drivers to compile and link. FreeLDR now stops at ArmPrepareForReactOS, when we get to enable the MMU, Caches and other such fun stuff. Bring-up now really starts!

[ros-arm-bringup at svn.reactos.org]

Author: ros-arm-bringup
Date: Sat Feb  9 03:59:05 2008
New Revision: 32233

URL: http://svn.reactos.org/svn/reactos?rev=32233&view=rev
Log:
A couple of header fixes to get all the FreeLDR-loaded boot drivers to compile and link.
FreeLDR now stops at ArmPrepareForReactOS, when we get to enable the MMU, Caches and other such fun stuff.
Bring-up now really starts!

Modified:
    trunk/reactos/include/ddk/ndis.h
    trunk/reactos/include/ndk/arm/ketypes.h
    trunk/reactos/include/reactos/armddk.h

Modified: trunk/reactos/include/ddk/ndis.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=32233&r1=32232&r2=32233&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ndis.h (original)
+++ trunk/reactos/include/ddk/ndis.h Sat Feb  9 03:59:05 2008
@@ -2285,7 +2285,7 @@
 
 #endif
 
-#if defined(_M_IX86) || defined(_M_AMD64)
+#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM)
 
 /*
  * VOID

Modified: trunk/reactos/include/ndk/arm/ketypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?rev=32233&r1=32232&r2=32233&view=diff
==============================================================================
--- trunk/reactos/include/ndk/arm/ketypes.h (original)
+++ trunk/reactos/include/ndk/arm/ketypes.h Sat Feb  9 03:59:05 2008
@@ -230,16 +230,5 @@
     return PCR->Prcb;
 }
 
-//
-// Macro to get current CPU
-//
-FORCEINLINE
-ULONG
-DDKAPI
-KeGetCurrentProcessorNumber(VOID)
-{
-    return PCR->Number;
-}
-
 #endif
 #endif

Modified: trunk/reactos/include/reactos/armddk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?rev=32233&r1=32232&r2=32233&view=diff
==============================================================================
--- trunk/reactos/include/reactos/armddk.h (original)
+++ trunk/reactos/include/reactos/armddk.h Sat Feb  9 03:59:05 2008
@@ -21,6 +21,11 @@
 #define USPCR                   0x7FFF0000
 #define PCR                     ((volatile KPCR * const)USPCR)
 #define USERPCR                 ((volatile KPCR * const)KIPCR)
+
+//
+// Just read it from the PCR
+//
+#define KeGetCurrentProcessorNumber() ((ULONG)(PCR->Number))
 
 //
 // Stub