X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=freeldr%2Ffreeldr%2Fmm%2Fmeminit.c;fp=freeldr%2Ffreeldr%2Fmm%2Fmeminit.c;h=408e4ff6490e9feafed4ef69cf3b7bbbe1b61ca2;hp=f04bcf92ef6b73f942d05add94eb6edf9bf1f778;hb=5882e75d373b853ce886761a0afab99119b0c95f;hpb=cfde60c60d83595d4e68b63e6a294da867e59ac5

diff --git a/freeldr/freeldr/mm/meminit.c b/freeldr/freeldr/mm/meminit.c
index f04bcf92ef6..408e4ff6490 100644
--- a/freeldr/freeldr/mm/meminit.c
+++ b/freeldr/freeldr/mm/meminit.c
@@ -24,6 +24,7 @@
 #include <rtl.h>
 #include <debug.h>
 #include <ui.h>
+#include <machine.h>
 
 
 #ifdef DEBUG
@@ -52,20 +53,16 @@ U32		LastFreePageHint = 0;
 BOOL MmInitializeMemoryManager(VOID)
 {
 	BIOS_MEMORY_MAP	BiosMemoryMap[32];
-	U32				BiosMemoryMapEntryCount;
-	U32				ExtendedMemorySize;
-	U32				ConventionalMemorySize;
+	U32		BiosMemoryMapEntryCount;
 #ifdef DEBUG
-	U32				Index;
+	U32		Index;
 #endif
 
 	DbgPrint((DPRINT_MEMORY, "Initializing Memory Manager.\n"));
 
 	RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32);
 
-	BiosMemoryMapEntryCount = GetBiosMemoryMap(BiosMemoryMap, 32);
-	ExtendedMemorySize = GetExtendedMemorySize();
-	ConventionalMemorySize = GetConventionalMemorySize();
+	BiosMemoryMapEntryCount = MachGetMemoryMap(BiosMemoryMap, sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP));
 
 #ifdef DEBUG
 	// Dump the system memory map
@@ -77,13 +74,6 @@ BOOL MmInitializeMemoryManager(VOID)
 			DbgPrint((DPRINT_MEMORY, "%x%x\t %x%x\t %s\n", BiosMemoryMap[Index].BaseAddress, BiosMemoryMap[Index].Length, MmGetSystemMemoryMapTypeString(BiosMemoryMap[Index].Type)));
 		}
 	}
-	else
-	{
-		DbgPrint((DPRINT_MEMORY, "GetBiosMemoryMap() not supported.\n"));
-	}
-
-	DbgPrint((DPRINT_MEMORY, "Extended memory size: %d KB\n", ExtendedMemorySize));
-	DbgPrint((DPRINT_MEMORY, "Conventional memory size: %d KB\n", ConventionalMemorySize));
 #endif
 
 	// If we got the system memory map then fixup invalid entries
@@ -92,19 +82,6 @@ BOOL MmInitializeMemoryManager(VOID)
 		MmFixupSystemMemoryMap(BiosMemoryMap, &BiosMemoryMapEntryCount);
 	}
 
-	// Since I don't feel like writing two sets of routines
-	// one to handle the BiosMemoryMap structure and another
-	// to handle just a flat extended memory size I'm going
-	// to create a 'fake' memory map entry out of the
-	// extended memory size if GetBiosMemoryMap() fails.
-	//if (BiosMemoryMapEntryCount == 0)
-	{
-		BiosMemoryMap[0].BaseAddress = 0x100000;		// Start at 1MB
-		BiosMemoryMap[0].Length = ExtendedMemorySize * 1024;
-		BiosMemoryMap[0].Type = MEMTYPE_USABLE;
-		BiosMemoryMapEntryCount = 1;
-	}
-
 	TotalPagesInLookupTable = MmGetAddressablePageCountIncludingHoles(BiosMemoryMap, BiosMemoryMapEntryCount);
 	PageLookupTableAddress = MmFindLocationForPageLookupTable(BiosMemoryMap, BiosMemoryMapEntryCount);
 	LastFreePageHint = TotalPagesInLookupTable;
@@ -159,7 +136,7 @@ PVOID MmGetEndAddressOfAnyMemory(PBIOS_MEMORY_MAP BiosMemoryMap, U32 MapCount)
 	EndAddressOfMemory = 0;
 	for (Index=0; Index<MapCount; Index++)
 	{
-		if (MaxStartAddressSoFar < BiosMemoryMap[Index].BaseAddress)
+		if (MaxStartAddressSoFar <= BiosMemoryMap[Index].BaseAddress)
 		{
 			MaxStartAddressSoFar = BiosMemoryMap[Index].BaseAddress;
 			EndAddressOfMemory = (MaxStartAddressSoFar + BiosMemoryMap[Index].Length);