diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-11-17 14:56:01 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-11-17 14:56:01 +0100 |
| commit | 54d36998da2e98039b960a3a9e6fb82e09717991 (patch) | |
| tree | 49ab40cafbd33fb3a91df9a4157895e2059f6f55 /kernel/mem.c | |
| parent | e1b3206c11baa396edaf49bfb45a2a443717eaa4 (diff) | |
trying to reactivate multitasking.
Diffstat (limited to 'kernel/mem.c')
| -rw-r--r-- | kernel/mem.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/mem.c b/kernel/mem.c index 00b6a90..d89ecc7 100644 --- a/kernel/mem.c +++ b/kernel/mem.c @@ -1,22 +1,21 @@ #define FOOLOS_MODULE_NAME "mem" -#define MEM_PRINT_MEMORYMAP +#include "config.h" #include "lib/int/stdint.h" #include "lib/logger/log.h" // logger facilities - //! 8 blocks per byte #define PMMNGR_BLOCKS_PER_BYTE 8 //! block size (4k) #define PMMNGR_BLOCK_SIZE 4096 -//! block alignment +//! block alignment ??? TODO: what is this!? #define PMMNGR_BLOCK_ALIGN PMMNGR_BLOCK_SIZE - //memory map bit array. Each bit represents a 4KB memory block static uint32_t *_mmngr_memory_map; + static uint32_t mem_free_blocks; static uint32_t mem_array_size; @@ -224,8 +223,8 @@ void mem_init(uint16_t *memmap,uint16_t entries) memmap+=12; } - // here is somewhere our kernel stuff ;) // todo!! better. - pmmngr_deinit_region(0x0,0x300000); + // here is somewhere our kernel stuff ;) // TODO!! better. + pmmngr_deinit_region(0x0,0x1000000); // and here is the memory map that we JUST created! pmmngr_deinit_region(_mmngr_memory_map,mem_array_size*4); |
