[ros-diffs] [akhaldi] 47202: [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.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Fri May 14 20:49:42 2010
New Revision: 47202

URL: http://svn.reactos.org/svn/reactos?rev=47202&view=rev
Log:
[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.

Modified:
    branches/header-work/boot/freeldr/freeldr.rbuild
    branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c
    branches/header-work/boot/freeldr/freeldr/bootmgr.c   (contents, props changed)
    branches/header-work/boot/freeldr/freeldr/freeldr.c   (contents, props changed)
    branches/header-work/include/reactos/arm/armddk.h

Modified: branches/header-work/boot/freeldr/freeldr.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeldr.rbuild?rev=47202&r1=47201&r2=47202&view=diff
==============================================================================
--- branches/header-work/boot/freeldr/freeldr.rbuild [iso-8859-1] (original)
+++ branches/header-work/boot/freeldr/freeldr.rbuild [iso-8859-1] Fri May 14 20:49:42 2010
@@ -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>

Modified: branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c
URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c?rev=47202&r1=47201&r2=47202&view=diff
==============================================================================
--- branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original)
+++ branches/header-work/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Fri May 14 20:49:42 2010
@@ -17,6 +17,8 @@
 ULONG gDiskReadBuffer, gFileSysBuffer;
 BOOLEAN ArmHwDetectRan;
 PCONFIGURATION_COMPONENT_DATA RootNode;
+
+BOOLEAN AcpiPresent = FALSE;
 
 ULONG FirstLevelDcacheSize;
 ULONG FirstLevelDcacheFillSize;

Modified: branches/header-work/boot/freeldr/freeldr/bootmgr.c
URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeldr/bootmgr.c?rev=47202&r1=47201&r2=47202&view=diff
==============================================================================
--- branches/header-work/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original)
+++ branches/header-work/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Fri May 14 20:49:42 2010
@@ -119,11 +119,13 @@
 		return;
 	}
 
+#ifdef _M_IX86
 	// Load additional SCSI driver (if any)
 	if (LoadBootDeviceDriver() != ESUCCESS)
 	{
 		UiMessageBoxCritical("Unable to load additional boot device driver");
 	}
+#endif
 
 	if (!IniFileInitialize())
 	{

Propchange: branches/header-work/boot/freeldr/freeldr/bootmgr.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision

Modified: branches/header-work/boot/freeldr/freeldr/freeldr.c
URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeldr/freeldr.c?rev=47202&r1=47201&r2=47202&view=diff
==============================================================================
--- branches/header-work/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original)
+++ branches/header-work/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Fri May 14 20:49:42 2010
@@ -47,7 +47,9 @@
 		return;
 	}
 
+#ifdef _M_IX86
 	HalpInitializePciStubs();
 	HalpInitBusHandler();
+#endif
 	RunLoader();
 }

Propchange: branches/header-work/boot/freeldr/freeldr/freeldr.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision

Modified: branches/header-work/include/reactos/arm/armddk.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/arm/armddk.h?rev=47202&r1=47201&r2=47202&view=diff
==============================================================================
--- branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] (original)
+++ branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] Fri May 14 20:49:42 2010
@@ -207,6 +207,12 @@
 #define RESULT_POSITIVE 2
 
 DECLSPEC_IMPORT
+BOOLEAN
+__fastcall
+ExiTryToAcquireFastMutex(
+    IN OUT PFAST_MUTEX FastMutex);
+
+DECLSPEC_IMPORT
 VOID
 __fastcall
 KfReleaseSpinLock(