Basic PS/2 keyboard driver, and ...

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

diff --git a/lunaix-os/kernel/k_main.c b/lunaix-os/kernel/k_main.c
index 52684d80126c9a39af775049d10d764331cd5eb9..b3b11031600f09744ac9300d123bfaa03cf9b77e 100644 (file)
--- a/lunaix-os/kernel/k_main.c
+++ b/lunaix-os/kernel/k_main.c
@@ -1,42 +1,71 @@
-#include <stdint.h>
-#include <lunaix/mm/vmm.h>
-#include <lunaix/mm/kalloc.h>

 #include <hal/cpu.h>
 #include <hal/cpu.h>

-#include <libc/stdio.h>
+#include <lunaix/syslog.h>
+#include <lunaix/mm/kalloc.h>
+#include <lunaix/mm/vmm.h>

 #include <lunaix/spike.h>
 #include <lunaix/spike.h>

+#include <lunaix/clock.h>
+#include <lunaix/timer.h>
+#include <stdint.h>

 
 extern uint8_t __kernel_start;
 
 
 extern uint8_t __kernel_start;
 

+LOG_MODULE("LX")
+
+void 
+test_timer(void* payload);
+

 void
 _kernel_main()
 {
     char buf[64];
 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");
            "address space!\n\n");

-    
+

     cpu_get_brand(buf);
     cpu_get_brand(buf);

-    printf("CPU: %s\n\n", buf);
+    kprintf("CPU: %s\n\n", buf);

 
     void* k_start = vmm_v2p(&__kernel_start);
 
     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
 
     // test malloc & free

-    
-    uint32_t** arr = (uint32_t**) kmalloc(10 * sizeof(uint32_t*));
-    
-    for (size_t i = 0; i < 10; i++)
-    {
-        arr[i] = (uint32_t*) kmalloc((i + 1) * 2);
-    }

 
 

-    void* big_ = kmalloc(8192);
+    uint8_t** arr = (uint8_t**)lxmalloc(10 * sizeof(uint8_t*));

 
 

-    for (size_t i = 0; i < 10; i++)
-    {
-        kfree(arr[i]);
+    for (size_t i = 0; i < 10; i++) {
+        arr[i] = (uint8_t*)lxmalloc((i + 1) * 2);

     }
     }

-    
-    kfree(arr);
-    kfree(big_);
+
+    for (size_t i = 0; i < 10; i++) {
+        lxfree(arr[i]);
+    }
+
+    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_);
+
+    timer_run_second(1, test_timer, NULL, TIMER_MODE_PERIODIC);
+
+    spin();
+}
+
+static datetime_t datetime;
+
+void test_timer(void* payload) {
+    clock_walltime(&datetime);
+
+    kprintf(KWARN "%u/%02u/%02u %02u:%02u:%02u\r",
+           datetime.year,
+           datetime.month,
+           datetime.day,
+           datetime.hour,
+           datetime.minute,
+           datetime.second);

 }
\ No newline at end of file
 }
\ No newline at end of file