Implement (half) simple semaphore & mutex lock, 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 a78562a822550f9f2d107d0f5b5d1c3b6cd0886a..c3819d9d8050b1e54a8f15d420f328b8ca1ea3b0 100644 (file)
--- a/lunaix-os/kernel/k_main.c
+++ b/lunaix-os/kernel/k_main.c
@@ -3,8 +3,10 @@
 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>

-#include <lunaix/time.h>
+#include <lunaix/clock.h>

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

+#include <lunaix/keyboard.h>
+#include <lunaix/tty/tty.h>

 #include <stdint.h>
 
 extern uint8_t __kernel_start;
 #include <stdint.h>
 
 extern uint8_t __kernel_start;


@@ -51,7 +53,19 @@ _kernel_main()
     lxfree(arr);
     lxfree(big_);
 
     lxfree(arr);
     lxfree(big_);
 

-    timer_run_second(1, test_timer, NULL, TIMER_MODE_PERIODIC);
+    // timer_run_second(1, test_timer, NULL, TIMER_MODE_PERIODIC);
+
+    struct kdb_keyinfo_pkt keyevent;
+    while (1)
+    {
+        if (!kbd_recv_key(&keyevent)) {
+            continue;
+        }
+        if ((keyevent.state & KBD_KEY_FPRESSED) && (keyevent.keycode & 0xff00) <= KEYPAD) {
+            tty_put_char((char)(keyevent.keycode & 0x00ff));
+            tty_sync_cursor();
+        }
+    }

 
     spin();
 }
 
     spin();
 }


@@ -59,7 +73,7 @@ _kernel_main()
 static datetime_t datetime;
 
 void test_timer(void* payload) {
 static datetime_t datetime;
 
 void test_timer(void* payload) {

-    time_getdatetime(&datetime);
+    clock_walltime(&datetime);

 
     kprintf(KWARN "%u/%02u/%02u %02u:%02u:%02u\r",
            datetime.year,
 
     kprintf(KWARN "%u/%02u/%02u %02u:%02u:%02u\r",
            datetime.year,