summaryrefslogtreecommitdiff
path: root/kernel/mem.c
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-08-08 16:26:48 +0200
committerMichal Idziorek <m.i@gmx.at>2014-08-08 16:26:48 +0200
commit670085f41e7706be51a1e99f44a637313b96419c (patch)
treecd20d9157e033db8012f4d1edb837a567ba7abeb /kernel/mem.c
parent7ac2301d899be25b5e51d138fdb227ed0dbdca2d (diff)
updated readme and minor changes in pmm
Diffstat (limited to 'kernel/mem.c')
-rw-r--r--kernel/mem.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/kernel/mem.c b/kernel/mem.c
index e1253b1..a0a6277 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -132,6 +132,22 @@ void pmmngr_free_block (void* p) {
}
+/*
+void mem_test_3()
+{
+ uint32_t *addr;
+
+ addr=pmmngr_alloc_block();
+ scr_put_string("alloc 1: ");
+ scr_put_hex32(addr);
+ scr_put_string_nl("");
+
+ addr=pmmngr_alloc_block();
+ scr_put_string("alloc 2: ");
+ scr_put_hex32(addr);
+ scr_put_string_nl("");
+}
+
void mem_test_2()
{
//crossing 512MB boundary!
@@ -186,6 +202,7 @@ void mem_test(int start, int end, int steps)
scr_put_string_nl("");
}
}
+*/
void mem_init(uint16_t *memmap)
{
@@ -239,7 +256,5 @@ void mem_init(uint16_t *memmap)
scr_put_string_nl("");
-
-
}