diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-09-03 14:04:12 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-09-03 14:04:12 +0200 |
| commit | a6efba7a22b85c0556c8c262f3bbcaf7bda7ddfa (patch) | |
| tree | e060237fe895995ad1fd6eee0f7f3b19beed8088 /kernel/mem.c | |
| parent | 0ce7674a27043cfdf4115d09d65493ac8af13563 (diff) | |
Moved kernel to 0x10000 !
Diffstat (limited to 'kernel/mem.c')
| -rw-r--r-- | kernel/mem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/mem.c b/kernel/mem.c index 0f52873..9899822 100644 --- a/kernel/mem.c +++ b/kernel/mem.c @@ -19,7 +19,7 @@ // memory map bit array. Each bit represents a memory block //uint32_t _mmngr_memory_map[MEM_BITMAP_SIZE]; -uint32_t *_mmngr_memory_map; +uint32_t _mmngr_memory_map[MEM_BITMAP_SIZE]; static uint32_t mem_free_blocks; @@ -246,11 +246,12 @@ void mem_test(int start, int end, int steps) void mem_init(uint16_t *memmap,uint16_t entries) { + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Initializing bitmap at: %08X",_mmngr_memory_map); log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"the memory map contains %d entries.",entries); // hardcoded memory bitmap!!??! // todo: fix! - _mmngr_memory_map=0x9000; + //_mmngr_memory_map=0x80000; mem_free_blocks=0; pmmngr_init (); |