diff options
author | Marvin Borner | 2020-01-20 23:12:54 +0100 |
---|---|---|
committer | Marvin Borner | 2020-01-20 23:12:54 +0100 |
commit | 391ed256d21a6ae2e2456d1809f357e6e96e15d1 (patch) | |
tree | 0fe9ffb3c59bbfeb3d8a04ab7fc6efba60d81e79 /src/kernel/lib/memory.c | |
parent | d5d1749257ff8b9aa6b5ace4b4720b484a2860f3 (diff) |
Added pure awesomeness
Actually quite some days of work but ok
Diffstat (limited to 'src/kernel/lib/memory.c')
-rw-r--r-- | src/kernel/lib/memory.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c index c1c6ee1..eb7f610 100644 --- a/src/kernel/lib/memory.c +++ b/src/kernel/lib/memory.c @@ -1,6 +1,5 @@ #include <stddef.h> #include <stdint.h> -#include <kernel/paging/paging.h> void *memcpy(void *dest, const void *src, size_t count) { @@ -53,13 +52,13 @@ void memory_init() max_length = i->length; } } - total_memory = max_base + max_length; + total_memory = (uint32_t) (max_base + max_length); total_memory /= 1024; } uint32_t memory_get_free() { - return total_memory - paging_get_used_pages() * 4; + return total_memory; // - paging_get_used_pages() * 4; } uint32_t memory_get_all() |