summaryrefslogtreecommitdiff
path: root/kernel/mem.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/mem.c')
-rw-r--r--kernel/mem.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/kernel/mem.c b/kernel/mem.c
index 531dd81..3a0b19b 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -1,25 +1,12 @@
#include <types.h>
#include <mem.h>
-
-static char eheap[EHEAP_SIZE] = {0};
-static size_t eheap_off = 0;
+#include <dtb.h>
+#include <common.h>
void* kmalloc(size_t size) {
return (void*)size;
}
-void* kemalloc(size_t size) {
- size = (size + 7) & ~7;
-
- if (eheap_off + size > EHEAP_SIZE) {
- return NULL;
- }
-
- void *ptr = &eheap[eheap_off];
- eheap_off += size;
- return ptr;
-}
-
void* memcpy(void *to, const void *from, size_t size) {
char *dest = (char *)to;
const char *src = (const char *)from;
@@ -30,3 +17,4 @@ void* memcpy(void *to, const void *from, size_t size) {
return dest;
}
+