Merge branch 'master' into vfs-dev

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

diff --git a/lunaix-os/kernel/lxinit.c b/lunaix-os/kernel/lxinit.c
index 2de87c5900d59d773499f956123eaae871ba89fe..4744cc17071ca71d7e9c847adbf993f85788c947 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -1,15 +1,13 @@
 #include <hal/cpu.h>
 #include <lunaix/clock.h>
-#include <lunaix/keyboard.h>
 #include <lunaix/lunistd.h>
+#include <lunaix/lxconsole.h>
 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/proc.h>
-#include <lunaix/signal.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>
-#include <lunaix/tty/tty.h>
 
 extern uint8_t __kernel_start;
 
@@ -19,12 +17,6 @@ LOG_MODULE("INIT")
 #define WAIT_DEMO
 #define IN_USER_MODE
 
-void __USER__
-sigchild_handler(int signum)
-{
-    kprintf(KINFO "SIGCHLD received\n");
-}
-
 void __USER__
 _lxinit_main()
 {
@@ -38,8 +30,6 @@ _lxinit_main()
     }
 #endif
 
-    signal(_SIGCHLD, sigchild_handler);
-
     int status;
 #ifdef WAIT_DEMO
     // 测试wait
@@ -50,7 +40,7 @@ _lxinit_main()
         kprintf("I am child, I am about to terminated\n");
         _exit(1);
     }
-    pause();
+    wait(&status);
     pid_t child = wait(&status);
     kprintf("I am parent, my child (%d) terminated normally with code: %d.\n",
             child,
@@ -67,15 +57,14 @@ _lxinit_main()
 
     waitpid(-1, &status, WNOHANG);
 
-    for (size_t i = 0; i < 10; i++) {
+    for (size_t i = 0; i < 5; i++) {
         pid_t pid = 0;
         if (!(pid = fork())) {
             sleep(i);
             if (i == 3) {
                 i = *(int*)0xdeadc0de; // seg fault!
             }
-            tty_put_char('0' + i);
-            tty_put_char('\n');
+            kprintf(KINFO "%d\n", i);
             _exit(0);
         }
         kprintf(KINFO "Forked %d\n", pid);
@@ -97,22 +86,5 @@ _lxinit_main()
     cpu_get_brand(buf);
     kprintf("CPU: %s\n\n", buf);
 
-    // no lxmalloc here! This can only be used within kernel, but here, we are
-    // in a dedicated process! any access to kernel method must be done via
-    // syscall
-
-    struct kdb_keyinfo_pkt keyevent;
-    while (1) {
-        if (!kbd_recv_key(&keyevent)) {
-            yield();
-            continue;
-        }
-        if ((keyevent.state & KBD_KEY_FPRESSED) &&
-            (keyevent.keycode & 0xff00) <= KEYPAD) {
-            tty_put_char((char)(keyevent.keycode & 0x00ff));
-            // FIXME: io to vga port is privileged and cause #GP in user mode
-            // tty_sync_cursor();
-        }
-    }
-    spin();
+    _exit(0);
 }
\ No newline at end of file