i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get_memory_map() is now silent when TRACE_MMU is not defined.

Browse Source 
When the 0xe820 memory map method doesn't work for whatever reason (broken BIOS),
it currently just assumes to have 32 MB - it now also prints out a warning when
it does so.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10298 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-11-30 17:33:46 +00:00
parent d99c404f77
commit 058569262f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/boot/platform/bios_ia32/mmu.cpp
+5
View File
@@ -189,6 +189,8 @@ get_memory_map(extended_memory **_extendedMemory)
bios_regs regs = { 0, 0, sizeof(extended_memory), 0, 0, (uint32)block, 0, 0}; bios_regs regs = { 0, 0, sizeof(extended_memory), 0, 0, (uint32)block, 0, 0};
uint32 count = 0; uint32 count = 0;
TRACE(("get_memory_map()\n"));
do { do {
regs.eax = 0xe820; regs.eax = 0xe820;
regs.edx = 'SMAP'; regs.edx = 'SMAP';
@@ -203,11 +205,13 @@ get_memory_map(extended_memory **_extendedMemory)
*_extendedMemory = block; *_extendedMemory = block;
#ifdef TRACE_MMU
dprintf("extended memory info (from 0xe820):\n"); dprintf("extended memory info (from 0xe820):\n");
for (uint32 i = 0; i < count; i++) { for (uint32 i = 0; i < count; i++) {
dprintf(" base 0x%Lx, len 0x%Lx, type %lu\n", dprintf(" base 0x%Lx, len 0x%Lx, type %lu\n",
block[i].base_addr, block[i].length, block[i].type); block[i].base_addr, block[i].length, block[i].type);
} }
#endif
return count; return count;
} }
@@ -507,6 +511,7 @@ mmu_init(void)
} }
} else { } else {
// ToDo: for now! // ToDo: for now!
dprintf("No extended memory block - using 32 MB (fix me!)\n");
uint32 memSize = 32 * 1024 * 1024; uint32 memSize = 32 * 1024 * 1024;
// we dont have an extended map, assume memory is contiguously mapped at 0x0 // we dont have an extended map, assume memory is contiguously mapped at 0x0