Merge branch 'console-dev'

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

diff --git a/lunaix-os/kernel/lxinit.c b/lunaix-os/kernel/lxinit.c
index 1485c3411e4d95266642876f8481f0b9b3168173..a767ec738e5dd9de408b3519549c3b8f050ff4f3 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -2,14 +2,13 @@
 #include <lunaix/clock.h>
 #include <lunaix/keyboard.h>
 #include <lunaix/lunistd.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/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/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>

-#include <lunaix/tty/tty.h>

 
 extern uint8_t __kernel_start;
 
 
 extern uint8_t __kernel_start;
 


@@ -19,12 +18,6 @@ LOG_MODULE("INIT")
 #define WAIT_DEMO
 #define IN_USER_MODE
 
 #define WAIT_DEMO
 #define IN_USER_MODE
 

-void __USER__
-sigchild_handler(int signum)
-{
-    kprintf(KINFO "SIGCHLD received\n");
-}
-

 void __USER__
 _lxinit_main()
 {
 void __USER__
 _lxinit_main()
 {


@@ -38,8 +31,6 @@ _lxinit_main()
     }
 #endif
 
     }
 #endif
 

-    signal(_SIGCHLD, sigchild_handler);
-

     int status;
 #ifdef WAIT_DEMO
     // 测试wait
     int status;
 #ifdef WAIT_DEMO
     // 测试wait


@@ -50,6 +41,7 @@ _lxinit_main()
         kprintf("I am child, I am about to terminated\n");
         _exit(1);
     }
         kprintf("I am child, I am about to terminated\n");
         _exit(1);
     }

+    wait(&status);

     pid_t child = wait(&status);
     kprintf("I am parent, my child (%d) terminated normally with code: %d.\n",
             child,
     pid_t child = wait(&status);
     kprintf("I am parent, my child (%d) terminated normally with code: %d.\n",
             child,


@@ -66,15 +58,14 @@ _lxinit_main()
 
     waitpid(-1, &status, WNOHANG);
 
 
     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!
             }
         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);
             _exit(0);
         }
         kprintf(KINFO "Forked %d\n", pid);


@@ -108,7 +99,7 @@ _lxinit_main()
         }
         if ((keyevent.state & KBD_KEY_FPRESSED) &&
             (keyevent.keycode & 0xff00) <= KEYPAD) {
         }
         if ((keyevent.state & KBD_KEY_FPRESSED) &&
             (keyevent.keycode & 0xff00) <= KEYPAD) {

-            tty_put_char((char)(keyevent.keycode & 0x00ff));
+            console_write_char((char)(keyevent.keycode & 0x00ff));

             // FIXME: io to vga port is privileged and cause #GP in user mode
             // tty_sync_cursor();
         }
             // FIXME: io to vga port is privileged and cause #GP in user mode
             // tty_sync_cursor();
         }