ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 19:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR]

Browse Source 
- 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
This commit is contained in:
Amine Khaldi
2010-05-14 18:49:42 +00:00
parent 5b939ffc3c
commit 0756bc5fd0
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot/freeldr/freeldr.rbuild
+6 -6
View File
@@ -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>
boot/freeldr/freeldr/arch/arm/macharm.c
+2
View File
@@ -18,6 +18,8 @@ ULONG gDiskReadBuffer, gFileSysBuffer;
BOOLEAN ArmHwDetectRan;
PCONFIGURATION_COMPONENT_DATA RootNode;
BOOLEAN AcpiPresent = FALSE;
ULONG FirstLevelDcacheSize;
ULONG FirstLevelDcacheFillSize;
ULONG FirstLevelIcacheSize;
boot/freeldr/freeldr/bootmgr.c
+2
View File
@@ -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())
{
boot/freeldr/freeldr/freeldr.c
+2
View File
@@ -47,7 +47,9 @@ VOID BootMain(LPSTR CmdLine)
return;
}
#ifdef _M_IX86
HalpInitializePciStubs();
HalpInitBusHandler();
#endif
RunLoader();
}
include/reactos/arm/armddk.h
+6
View File
@@ -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