7-ps2_keyboard.md and 8-multitasking.md (#29)

[lunaix-os.git] / lunaix-os / includes / lunaix / syslog.h

diff --git a/lunaix-os/includes/lunaix/syslog.h b/lunaix-os/includes/lunaix/syslog.h
index f5fc8dba760e2f547e926b8c0c48a6d3af870947..621c81a76d231a609ce1ecf1313aba062fc729e8 100644 (file)
--- a/lunaix-os/includes/lunaix/syslog.h
+++ b/lunaix-os/includes/lunaix/syslog.h
@@ -1,34 +1,44 @@
 #ifndef __LUNAIX_SYSLOG_H
 #define __LUNAIX_SYSLOG_H
 
+#include <lunaix/compiler.h>
+#include <lunaix/spike.h>
 #include <stdarg.h>
 
-#define _LEVEL_INFO "0"
-#define _LEVEL_WARN "1"
-#define _LEVEL_ERROR "2"
-#define _LEVEL_DEBUG "3"
+#define KLOG_DEBUG 0
+#define KLOG_INFO 1
+#define KLOG_WARN 2
+#define KLOG_ERROR 3
+#define KLOG_FATAL 4
 
-#define KINFO "\x1b" _LEVEL_INFO
-#define KWARN "\x1b" _LEVEL_WARN
-#define KERROR "\x1b" _LEVEL_ERROR
-#define KDEBUG "\x1b" _LEVEL_DEBUG
+#define KMSG_LVLSTART '\x1b'
+#define KMSG_LOGLEVEL(c) ((c) - '0')
+
+#define KDEBUG "\x1b" stringify__(KLOG_DEBUG)
+#define KINFO "\x1b" stringify__(KLOG_INFO)
+#define KWARN "\x1b" stringify__(KLOG_WARN)
+#define KERROR "\x1b" stringify__(KLOG_ERROR)
+#define KFATAL "\x1b" stringify__(KLOG_FATAL)
 
 #define LOG_MODULE(module)                                                     \
     static void kprintf(const char* fmt, ...)                                  \
     {                                                                          \
         va_list args;                                                          \
         va_start(args, fmt);                                                   \
-        __kprintf(module, fmt, args);                                          \
+        kprintf_m(module, fmt, args);                                          \
         va_end(args);                                                          \
     }
 
-void
-__kprintf(const char* component, const char* fmt, va_list args);
+#define DEBUG(fmt, ...) kprintf(KDEBUG fmt, ##__VA_ARGS__)
+#define INFO(fmt, ...) kprintf(KINFO fmt, ##__VA_ARGS__)
+#define WARN(fmt, ...) kprintf(KWARN fmt, ##__VA_ARGS__)
+#define ERROR(fmt, ...) kprintf(KERROR fmt, ##__VA_ARGS__)
+#define FATAL(fmt, ...)                                                        \
+    ({                                                                         \
+        kprintf(KFATAL fmt, ##__VA_ARGS__);                                    \
+        fail(fmt);                                                             \
+    })
 
 void
-kprint_hex(const void* buffer, unsigned int size);
-
-void
-kprint_panic(const char* fmt, ...);
-
+kprintf_m(const char* component, const char* fmt, va_list args);
 #endif /* __LUNAIX_SYSLOG_H */