improved in-kernel alloc/dealloc. addded colorless logging and struggling with mouse and kb

1 files changed, 23 insertions, 3 deletions

diff --git a/kernel/log.h b/kernel/log.h
index ba92788..74f8776 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -15,11 +15,31 @@ void log(bool color,char *module_name, int prio, char *format_string, ...);
 
 // __FUNCTION__ ?
 #ifndef FOOLOS_LOG_OFF
-#define kpanic(...) {log(FOOLOS_LOG_COLOR,__FILE__,0," \033[41;37m [KERNEL PANIC] \033[37;40m " __VA_ARGS__ ); while(1);}
-#define klog(...) log(FOOLOS_LOG_COLOR,__FILE__ ":" S2(__LINE__), 10,  __VA_ARGS__)
-#define fixme(...) log(FOOLOS_LOG_COLOR,__FILE__ ":" S2(__LINE__) , 10, " \033[46;37m [FIXME] \033[37;40m "__VA_ARGS__)
+
+#ifdef FOOLOS_COLORLESS
+#define FOOLOS_LOG_COLOR false
+#define LOG_LABEL_INFO  " [INFO]  "
+#define LOG_LABEL_PANIC " [PANIC] "
+#define LOG_LABEL_FIX   " [FIXME] "
+#define LOG_LABEL_TEST  " [TEST]  "
+#endif
+
+#ifndef FOOLOS_COLORLESS
+#define FOOLOS_LOG_COLOR true
+#define LOG_LABEL_INFO   " \033[46;37m [INFO]  \033[37;40m "
+#define LOG_LABEL_PANIC  " \033[41;37m [PANIC] \033[37;40m "
+#define LOG_LABEL_FIX    " \033[44;37m [FIXME] \033[37;40m "
+#define LOG_LABEL_TEST   " \033[42;37m [TEST]  \033[37;40m "
 #endif
 
+#define klog(...) log(FOOLOS_LOG_COLOR,__FILE__ ":" S2(__LINE__), 10,    LOG_LABEL_INFO  __VA_ARGS__)
+#define kpanic(...) {log(FOOLOS_LOG_COLOR,__FILE__ ":" S2(__LINE__) ,0,  LOG_LABEL_PANIC __VA_ARGS__ ); while(1);}
+#define fixme(...) log(FOOLOS_LOG_COLOR,__FILE__ ":" S2(__LINE__) , 10,  LOG_LABEL_FIX __VA_ARGS__)
+#define testlog(...) log(FOOLOS_LOG_COLOR,__FILE__ ":" S2(__LINE__) , 10,LOG_LABEL_TEST __VA_ARGS__)
+
+#endif
+
+
 #ifdef FOOLOS_LOG_OFF
 #define kpanic(...) {while(1);}
 #define klog(...) {}