Merge branch 'master' into sata-ahci-dev

[lunaix-os.git] / lunaix-os / kernel / kprintf.c

diff --git a/lunaix-os/kernel/kprintf.c b/lunaix-os/kernel/kprintf.c
index a862bcc7db97a873d0735348ac99aaa3a74cff79..d18691ac2fd1fa6d9ccd3389dcb7058c5710408d 100644 (file)
--- a/lunaix-os/kernel/kprintf.c
+++ b/lunaix-os/kernel/kprintf.c
@@ -1,64 +1,113 @@
+#include <klibc/stdio.h>
+#include <lunaix/lxconsole.h>
 #include <lunaix/syslog.h>
 #include <lunaix/tty/tty.h>
-#include <klibc/stdio.h>
-
-#define MAX_KPRINTF_BUF_SIZE 1024
-#define MAX_XFMT_SIZE 1024
 
-static char buf[MAX_KPRINTF_BUF_SIZE];
+#define MAX_KPRINTF_BUF_SIZE 512
+#define MAX_XFMT_SIZE 512
 
 void
-__kprintf(const char* component, const char* fmt, va_list args) {
-    if (!fmt) return;
+__kprintf(const char* component, const char* fmt, va_list args)
+{
+    char buf[MAX_KPRINTF_BUF_SIZE];
+    if (!fmt)
+        return;
     char log_level = '0';
     char expanded_fmt[MAX_XFMT_SIZE];
-    vga_attribute current_theme = tty_get_theme();
 
     if (*fmt == '\x1b') {
         log_level = *(++fmt);
         fmt++;
     }
 
-    switch (log_level)
-    {
-    case '0':
-        snprintf(expanded_fmt, MAX_XFMT_SIZE, "[%s] (%s) %s", "INFO", component, fmt);
-        break;
-    case '1':
-        tty_set_theme(VGA_COLOR_BROWN, current_theme >> 12);
-        snprintf(expanded_fmt, MAX_XFMT_SIZE, "[%s] (%s) %s", "WARN", component, fmt);
-        break;
-    case '2':
-        tty_set_theme(VGA_COLOR_LIGHT_RED, current_theme >> 12);
-        snprintf(expanded_fmt, MAX_XFMT_SIZE, "[%s] (%s) %s", "EROR", component, fmt);
-        break;
-    case '3':
-        tty_set_theme(VGA_COLOR_LIGHT_BLUE, current_theme >> 12);
-        snprintf(expanded_fmt, MAX_XFMT_SIZE, "[%s] (%s) %s", "DEBG", component, fmt);
-        break;
-    default:
-        snprintf(expanded_fmt, MAX_XFMT_SIZE, "[%s] (%s) %s", "LOG", component, fmt);
-        break;
+    switch (log_level) {
+        case '0':
+            snprintf(expanded_fmt,
+                     MAX_XFMT_SIZE,
+                     "[%s] (%s) %s",
+                     "INFO",
+                     component,
+                     fmt);
+            break;
+        case '1':
+            // tty_set_theme(VGA_COLOR_BROWN, current_theme >> 12);
+            snprintf(expanded_fmt,
+                     MAX_XFMT_SIZE,
+                     "\033[6;0m[%s] (%s) %s\033[39;49m",
+                     "WARN",
+                     component,
+                     fmt);
+            break;
+        case '2':
+            // tty_set_theme(VGA_COLOR_LIGHT_RED, current_theme >> 12);
+            snprintf(expanded_fmt,
+                     MAX_XFMT_SIZE,
+                     "\033[12;0m[%s] (%s) %s\033[39;49m",
+                     "EROR",
+                     component,
+                     fmt);
+            break;
+        case '3':
+            // tty_set_theme(VGA_COLOR_LIGHT_BLUE, current_theme >> 12);
+            snprintf(expanded_fmt,
+                     MAX_XFMT_SIZE,
+                     "\033[9;0m[%s] (%s) %s\033[39;49m",
+                     "DEBG",
+                     component,
+                     fmt);
+            break;
+        default:
+            snprintf(expanded_fmt,
+                     MAX_XFMT_SIZE,
+                     "[%s] (%s) %s",
+                     "LOG",
+                     component,
+                     fmt);
+            break;
     }
 
     __sprintf_internal(buf, expanded_fmt, MAX_KPRINTF_BUF_SIZE, args);
-    tty_put_str(buf);
-    tty_set_theme(current_theme >> 8, current_theme >> 12);
+    console_write_str(buf);
 }
 
 void
-kprint_panic(const char* fmt, ...) {
+kprint_panic(const char* fmt, ...)
+{
+    char buf[MAX_KPRINTF_BUF_SIZE];
     va_list args;
     va_start(args, fmt);
-    
+
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_RED);
-    tty_clear_line(10);
-    tty_clear_line(11);
-    tty_clear_line(12);
-    tty_set_cpos(0, 11);
+    tty_clear_line(24);
 
     __sprintf_internal(buf, fmt, MAX_KPRINTF_BUF_SIZE, args);
-    tty_put_str(buf);
+    tty_put_str_at(buf, 0, 24);
 
     va_end(args);
+}
+
+void
+kprint_hex(const void* buffer, unsigned int size)
+{
+    unsigned char* data = (unsigned char*)buffer;
+    char buf[16];
+    char ch_cache[16];
+    unsigned int ptr = 0;
+    int i;
+
+    ch_cache[0] = '|';
+    ch_cache[1] = ' ';
+    while (size) {
+        snprintf(buf, 64, " %.4p: ", ptr);
+        console_write_str(buf);
+        for (i = 0; i < 8 && size; i++, size--, ptr++) {
+            unsigned char c = *(data + ptr) & 0xff;
+            ch_cache[2 + i] = (32 <= c && c < 127) ? c : '.';
+            snprintf(buf, 64, "%.2x  ", c);
+            console_write_str(buf);
+        }
+        ch_cache[2 + i] = '\0';
+        console_write_str(ch_cache);
+        console_write_char('\n');
+    }
 }
\ No newline at end of file