summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-08-19 09:39:51 +0200
committerMichal Idziorek <m.i@gmx.at>2014-08-19 09:39:51 +0200
commit6595b6ed72c5edf1586b9c5a1298827f78457c38 (patch)
tree434e1f87eb32f583fc2d5d3bf9cfaa4b09752e73
parentae38fa16c1ee45ccd9acb4a91ad9ccf01955f6a6 (diff)
minimal text changes
-rw-r--r--kernel/mem.c4
-rw-r--r--kernel/vmem.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/kernel/mem.c b/kernel/mem.c
index a0a6277..d45e10f 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -214,11 +214,12 @@ void mem_init(uint16_t *memmap)
// count available memory
uint32_t avail_mem=0;
- //print memory map;
+ //print memory map and init regions!
while(1)
{
if(memmap[8]==0)break;
+
scr_put_hex(memmap[8]);
scr_put_string(" : ");
@@ -235,6 +236,7 @@ void mem_init(uint16_t *memmap)
scr_put_string_nl("");
+
if(memmap[8]==1)
{
avail_mem+=memmap[4]+(memmap[5]<<16);
diff --git a/kernel/vmem.c b/kernel/vmem.c
index d434dee..7e48dea 100644
--- a/kernel/vmem.c
+++ b/kernel/vmem.c
@@ -72,5 +72,5 @@ struct pdirectory {
void vmem_init()
{
- scr_put_string_nl("todo: init paging");
+ scr_put_string_nl("Init paging (TODO)");
}