From c15925a24efe14f437d8a2699500241a58fdc8f9 Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 17 Aug 2018 21:41:21 +0200 Subject: cleanup and working on fifo pipes --- kernel/kmalloc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'kernel/kmalloc.c') diff --git a/kernel/kmalloc.c b/kernel/kmalloc.c index e3b0863..6db07a1 100644 --- a/kernel/kmalloc.c +++ b/kernel/kmalloc.c @@ -1,12 +1,10 @@ #define FOOLOS_MODULE_NAME "kmalloc" #include "kmalloc.h" +#include "kernel/config.h" #include "lib/logger/log.h" -// 8MB for in kernel-memory -#define MEM_SIZE 1024*1024*8 - -static uint8_t data[MEM_SIZE]; // bytes +static uint8_t data[KMALLOC_MEM_SIZE]; // bytes static uint32_t next; static uint32_t first; @@ -41,12 +39,12 @@ uint32_t kballoc(uint32_t size) uint32_t old=next; next+=size; - if(next>=first+MEM_SIZE) + if(next>=first+KMALLOC_MEM_SIZE) { - panic(FOOLOS_MODULE_NAME,"kballoc ran out of memory! maybe increase MEM_SIZE in kmalloc.c?"); + panic(FOOLOS_MODULE_NAME,"kballoc ran out of memory! maybe increase KMALLOC_MEM_SIZE in kmalloc.c?"); } - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"(%d) : 0x%08X (~%dKB left)",size,old,(MEM_SIZE-next+first)/1024); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"(%d) : 0x%08X (~%dKB left)",size,old,(KMALLOC_MEM_SIZE-next+first)/1024); return old; } -- cgit v1.2.3