X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/7b0dccbab69e806a63c4504c3ddb82e45241985b..05b7549a0f980efa33265a091a5174a78851ce05:/lunaix-os/kernel/k_main.c

diff --git a/lunaix-os/kernel/k_main.c b/lunaix-os/kernel/k_main.c
index 121273b..8104408 100644
--- a/lunaix-os/kernel/k_main.c
+++ b/lunaix-os/kernel/k_main.c
@@ -1,42 +1,51 @@
-#include <stdint.h>
-#include <lunaix/mm/vmm.h>
-#include <lunaix/mm/dmm.h>
 #include <hal/cpu.h>
-#include <libc/stdio.h>
+#include <hal/rtc.h>
+#include <lunaix/syslog.h>
+#include <lunaix/mm/kalloc.h>
+#include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
+#include <stdint.h>
 
 extern uint8_t __kernel_start;
 
+LOG_MODULE("LX")
+
 void
 _kernel_main()
 {
     char buf[64];
-    
-    printf("Hello higher half kernel world!\nWe are now running in virtual "
+
+    kprintf(KINFO "Hello higher half kernel world!\nWe are now running in virtual "
            "address space!\n\n");
-    
+
     cpu_get_brand(buf);
-    printf("CPU: %s\n\n", buf);
+    kprintf("CPU: %s\n\n", buf);
 
     void* k_start = vmm_v2p(&__kernel_start);
-    printf("The kernel's base address mapping: %p->%p\n", &__kernel_start, k_start);
+    kprintf(KINFO "The kernel's base address mapping: %p->%p\n", &__kernel_start, k_start);
 
     // test malloc & free
-    
-    uint32_t** arr = (uint32_t**) lx_malloc(10 * sizeof(uint32_t*));
-    
-    for (size_t i = 0; i < 10; i++)
-    {
-        arr[i] = (uint32_t*) lx_malloc((i + 1) * 2);
-    }
 
-    void* big_ = lx_malloc(8192);
+    uint8_t** arr = (uint8_t**)lxmalloc(10 * sizeof(uint8_t*));
+
+    for (size_t i = 0; i < 10; i++) {
+        arr[i] = (uint8_t*)lxmalloc((i + 1) * 2);
+    }
 
-    for (size_t i = 0; i < 10; i++)
-    {
-        lx_free(arr[i]);
+    for (size_t i = 0; i < 10; i++) {
+        lxfree(arr[i]);
     }
-    
-    lx_free(arr);
-    lx_free(big_);
+
+    uint8_t* big_ = lxmalloc(8192);
+    big_[0] = 123;
+    big_[1] = 23;
+    big_[2] = 3;
+
+    kprintf(KINFO "%u, %u, %u\n", big_[0], big_[1], big_[2]);
+
+    // good free
+    lxfree(arr);
+    lxfree(big_);
+
+    spin();
 }
\ No newline at end of file