refactor: add user space printf.

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index ec997425b9c0161ab817d19f91591c9c4c5585d2..f926ffda7df7926c6a063aabdaab1f0fa7b36898 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,6 +1,6 @@
-#include <arch/x86/boot/multiboot.h>

 #include <lunaix/block.h>
 #include <lunaix/common.h>
 #include <lunaix/block.h>
 #include <lunaix/common.h>

+#include <lunaix/fctrl.h>

 #include <lunaix/fs.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/fs.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/lunistd.h>


@@ -14,16 +14,21 @@
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>

-#include <stddef.h>
+#include <lunaix/types.h>

 
 #include <hal/acpi/acpi.h>
 #include <hal/ahci/ahci.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>
 
 #include <hal/acpi/acpi.h>
 #include <hal/ahci/ahci.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>

+#include <hal/rtc.h>
+
+#include <arch/x86/boot/multiboot.h>

 
 #include <klibc/string.h>
 
 
 #include <klibc/string.h>
 

+#include <ulibc/stdio.h>
+

 LOG_MODULE("PROC0")
 
 extern void
 LOG_MODULE("PROC0")
 
 extern void


@@ -44,7 +49,8 @@ __do_reserved_memory(int unlock);
 #define USE_DEMO
 // #define DEMO_SIGNAL
 // #define DEMO_READDIR
 #define USE_DEMO
 // #define DEMO_SIGNAL
 // #define DEMO_READDIR

-#define DEMO_IOTEST
+// #define DEMO_IOTEST
+#define DEMO_INPUT_TEST

 
 extern void
 _pconsole_main();
 
 extern void
 _pconsole_main();


@@ -61,13 +67,22 @@ _readdir_main();
 extern void
 _iotest_main();
 
 extern void
 _iotest_main();
 

+extern void
+input_test();
+

 void __USER__
 __proc0_usr()
 {
 void __USER__
 __proc0_usr()
 {

+    // 打开tty设备(控制台)，作为标准输入输出。
+    //  tty设备属于序列设备（Sequential Device），该类型设备的上层读写
+    //  无须经过Lunaix的缓存层，而是直接下发到底层驱动。（不受FO_DIRECT的影响）
+    int fdstdout = open("/dev/tty", 0);
+    int fdstdin = dup2(stdout, 1);
+

     pid_t p;
     pid_t p;

-    if (!fork()) {
-        _pconsole_main();
-    }
+    // if (!fork()) {
+    //     _pconsole_main();
+    // }

 
     if (!(p = fork())) {
 #ifndef USE_DEMO
 
     if (!(p = fork())) {
 #ifndef USE_DEMO


@@ -78,9 +93,13 @@ __proc0_usr()
         _readdir_main();
 #elif defined DEMO_IOTEST
         _iotest_main();
         _readdir_main();
 #elif defined DEMO_IOTEST
         _iotest_main();

+#elif defined DEMO_INPUT_TEST
+        input_test();

 #else
         _lxinit_main();
 #endif
 #else
         _lxinit_main();
 #endif

+        printf("==== test end ====\n");
+        _exit(0);

     }
 
     waitpid(p, 0, 0);
     }
 
     waitpid(p, 0, 0);


@@ -132,8 +151,7 @@ init_platform()
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 

-    assert_msg(kalloc_init(), "Fail to initialize heap");
-
+    rtc_init();

     acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();
     acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();


@@ -143,8 +161,6 @@ init_platform()
     pci_init();
     block_init();
     ahci_init();
     pci_init();
     block_init();
     ahci_init();

-    // ahci_list_device();
-    // cake_stats();

 
     syscall_install();
 
 
     syscall_install();