Second Extended Filesystem (ext2) and other improvements (#33)

[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 b372daad4ce64f18b7665fb1180bc644127ab1cc..3b827f678e409dc1249ce2c4ab9d8f9ef40d012c 100644 (file)
--- a/lunaix-os/includes/lunaix/syslog.h
+++ b/lunaix-os/includes/lunaix/syslog.h
@@ -2,6 +2,7 @@
 #define __LUNAIX_SYSLOG_H
 
 #include <lunaix/compiler.h>
 #define __LUNAIX_SYSLOG_H
 
 #include <lunaix/compiler.h>

+#include <lunaix/spike.h>

 #include <stdarg.h>
 
 #define KLOG_DEBUG 0
 #include <stdarg.h>
 
 #define KLOG_DEBUG 0


@@ -28,34 +29,21 @@
         va_end(args);                                                          \
     }
 
         va_end(args);                                                          \
     }
 

+#define printk(fmt, ...) kprintf_v(__FILE__, fmt, ##__VA_ARGS__)
+

 #define DEBUG(fmt, ...) kprintf(KDEBUG fmt, ##__VA_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__);                                    \
 #define WARN(fmt, ...) kprintf(KWARN fmt, ##__VA_ARGS__)
 #define ERROR(fmt, ...) kprintf(KERROR fmt, ##__VA_ARGS__)
 #define FATAL(fmt, ...)                                                        \
     ({                                                                         \
         kprintf(KFATAL fmt, ##__VA_ARGS__);                                    \

-        spin();                                                                \
+        fail(fmt);                                                             \

     })
 
 void
 kprintf_m(const char* component, const char* fmt, va_list args);
 
     })
 
 void
 kprintf_m(const char* component, const char* fmt, va_list args);
 

-// TODO need more thought on it
-
-// struct klog_chunk
-// {
-//     void* log_entry;
-//     size_t max_len;
-//     size_t len;
-// };
-
-// struct klog_chunk*
-// kprintf_lcstart_m(const char* component, size_t size);
-
-// void
-// kprintf_lcappend_m(struct klog_chunk*, const char* fmt, va_list args);
-
-// void
-// kprintf_lcdone_m(struct klog_chunk*);
-
+void
+kprintf_v(const char* component, const char* fmt, ...);

 #endif /* __LUNAIX_SYSLOG_H */
 #endif /* __LUNAIX_SYSLOG_H */