From 391ed256d21a6ae2e2456d1809f357e6e96e15d1 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Mon, 20 Jan 2020 23:12:54 +0100 Subject: Added pure awesomeness Actually quite some days of work but ok --- src/kernel/lib/memory.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/kernel/lib/memory.c') 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 #include -#include 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() -- cgit v1.2.3