[FREELDR]

- freeldr.rbuild : Apply a consistent formatting.
- Add the missing AcpiPresent variable to macharm.c
- Exclude a couple of code paths when building for ARM.
[ARMDDK]
- Add missing ExiTryToAcquireFastMutex declaration.

svn path=/branches/header-work/; revision=47202

diff --git a/boot/freeldr/freeldr.rbuild b/boot/freeldr/freeldr.rbuild
index 422cd3c..4f47639 100644 (file)
--- a/boot/freeldr/freeldr.rbuild
+++ b/boot/freeldr/freeldr.rbuild
@@ -12,16 +12,16 @@
                <xi:include href="freeldr/freeldr_main.rbuild" />
                <xi:include href="freeldr/freeldr.rbuild" />
                <if property="ARCH" value="i386">
-                   <xi:include href="freeldr/setupldr_main.rbuild" />
-                   <xi:include href="freeldr/setupldr.rbuild" />               
+                       <xi:include href="freeldr/setupldr_main.rbuild" />
+                       <xi:include href="freeldr/setupldr.rbuild" />
                </if>
                <if property="ARCH" value="ppc">
-                   <xi:include href="freeldr/setupldr_main.rbuild" />
-                   <xi:include href="freeldr/setupldr.rbuild" />               
+                       <xi:include href="freeldr/setupldr_main.rbuild" />
+                       <xi:include href="freeldr/setupldr.rbuild" />
                </if>
                <if property="ARCH" value="amd64">
-                   <xi:include href="freeldr/setupldr_main.rbuild" />
-                   <xi:include href="freeldr/setupldr.rbuild" />               
+                       <xi:include href="freeldr/setupldr_main.rbuild" />
+                       <xi:include href="freeldr/setupldr.rbuild" />
                </if>
        </directory>
 </group>

diff --git a/boot/freeldr/freeldr/arch/arm/macharm.c b/boot/freeldr/freeldr/arch/arm/macharm.c
index b0b8e27..ae5e96e 100644 (file)
--- a/boot/freeldr/freeldr/arch/arm/macharm.c
+++ b/boot/freeldr/freeldr/arch/arm/macharm.c
@@ -18,6 +18,8 @@ ULONG gDiskReadBuffer, gFileSysBuffer;
 BOOLEAN ArmHwDetectRan;
 PCONFIGURATION_COMPONENT_DATA RootNode;
 
+BOOLEAN AcpiPresent = FALSE;
+
 ULONG FirstLevelDcacheSize;
 ULONG FirstLevelDcacheFillSize;
 ULONG FirstLevelIcacheSize;

diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c
index 0959de6..3242a3e 100644 (file)
--- a/boot/freeldr/freeldr/bootmgr.c
+++ b/boot/freeldr/freeldr/bootmgr.c
@@ -119,11 +119,13 @@ VOID RunLoader(VOID)
                return;
        }
 
+#ifdef _M_IX86
        // Load additional SCSI driver (if any)
        if (LoadBootDeviceDriver() != ESUCCESS)
        {
                UiMessageBoxCritical("Unable to load additional boot device driver");
        }
+#endif
 
        if (!IniFileInitialize())
        {

diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c
index 5761ed9..04dae9b 100644 (file)
--- a/boot/freeldr/freeldr/freeldr.c
+++ b/boot/freeldr/freeldr/freeldr.c
@@ -47,7 +47,9 @@ VOID BootMain(LPSTR CmdLine)
                return;
        }
 
+#ifdef _M_IX86
        HalpInitializePciStubs();
        HalpInitBusHandler();
+#endif
        RunLoader();
 }

diff --git a/include/reactos/arm/armddk.h b/include/reactos/arm/armddk.h
index ad235b0..bf3ddd6 100644 (file)
--- a/include/reactos/arm/armddk.h
+++ b/include/reactos/arm/armddk.h
@@ -206,6 +206,12 @@ extern volatile struct _KSYSTEM_TIME KeTickCount;
 #define RESULT_NEGATIVE 1
 #define RESULT_POSITIVE 2
 
+DECLSPEC_IMPORT
+BOOLEAN
+__fastcall
+ExiTryToAcquireFastMutex(
+    IN OUT PFAST_MUTEX FastMutex);
+
 DECLSPEC_IMPORT
 VOID
 __fastcall