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 43f0f2d9381e2ba7a533696298a38d934c5b3432..a767ec738e5dd9de408b3519549c3b8f050ff4f3 100644 (file)
--- a/lunaix-os/kernel/lxinit.c
+++ b/lunaix-os/kernel/lxinit.c
@@ -2,22 +2,23 @@
 #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/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>
 #include <lunaix/mm/kalloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/proc.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>

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

 
 extern uint8_t __kernel_start;
 
 LOG_MODULE("INIT")
 
 // #define FORK_BOMB_DEMO
 
 extern uint8_t __kernel_start;
 
 LOG_MODULE("INIT")
 
 // #define FORK_BOMB_DEMO

-// #define WAIT_DEMO
+#define WAIT_DEMO
+#define IN_USER_MODE

 
 

-void
+void __USER__

 _lxinit_main()
 {
 #ifdef FORK_BOMB_DEMO
 _lxinit_main()
 {
 #ifdef FORK_BOMB_DEMO


@@ -40,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,


@@ -63,8 +65,7 @@ _lxinit_main()
             if (i == 3) {
                 i = *(int*)0xdeadc0de; // seg fault!
             }
             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);


@@ -93,15 +94,15 @@ _lxinit_main()
     struct kdb_keyinfo_pkt keyevent;
     while (1) {
         if (!kbd_recv_key(&keyevent)) {
     struct kdb_keyinfo_pkt keyevent;
     while (1) {
         if (!kbd_recv_key(&keyevent)) {

-            // yield();
+            yield();

             continue;
         }
         if ((keyevent.state & KBD_KEY_FPRESSED) &&
             (keyevent.keycode & 0xff00) <= KEYPAD) {
             continue;
         }
         if ((keyevent.state & KBD_KEY_FPRESSED) &&
             (keyevent.keycode & 0xff00) <= KEYPAD) {

-            tty_put_char((char)(keyevent.keycode & 0x00ff));
-            tty_sync_cursor();
+            console_write_char((char)(keyevent.keycode & 0x00ff));
+            // FIXME: io to vga port is privileged and cause #GP in user mode
+            // tty_sync_cursor();

         }
     }
         }
     }

-

     spin();
 }
\ No newline at end of file
     spin();
 }
\ No newline at end of file