Merge branch 'vfs-dev'

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index bef7bb7316f896afa4cc8e77c90cdcada4ec672d..5fac5f86f609e3efc078701234451291fe7ca454 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,5 +1,9 @@
 #include <arch/x86/boot/multiboot.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/lxconsole.h>
 #include <lunaix/mm/cake.h>
@@ -14,11 +18,13 @@
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>
-#include <hal/ahci.h>
+#include <hal/ahci/ahci.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>
 
+#include <klibc/string.h>
+
 LOG_MODULE("PROC0")
 
 extern void
@@ -36,8 +42,10 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
-//#define USE_DEMO
-#define DEMO_SIGNAL
+#define USE_DEMO
+// #define DEMO_SIGNAL
+// #define DEMO_READDIR
+#define DEMO_IOTEST
 
 extern void
 _pconsole_main();
@@ -48,9 +56,21 @@ _signal_demo_main();
 extern void
 _lxinit_main();
 
+extern void
+_readdir_main();
+
+extern void
+_iotest_main();
+
 void __USER__
 __proc0_usr()
 {
+    // 打开tty设备(控制台)，作为标准输入输出。
+    //  tty设备属于序列设备（Sequential Device），该类型设备的上层读写
+    //  无须经过Lunaix的缓存层，而是直接下发到底层驱动。（不受FO_DIRECT的影响）
+    int stdout = open("/dev/tty", 0);
+    int stdin = dup2(stdout, 1);
+
     pid_t p;
     if (!fork()) {
         _pconsole_main();
@@ -61,6 +81,10 @@ __proc0_usr()
         _exit(0);
 #elif defined DEMO_SIGNAL
         _signal_demo_main();
+#elif defined DEMO_READDIR
+        _readdir_main();
+#elif defined DEMO_IOTEST
+        _iotest_main();
 #else
         _lxinit_main();
 #endif
@@ -115,10 +139,7 @@ init_platform()
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
-    cake_init();
-
     assert_msg(kalloc_init(), "Fail to initialize heap");
-    valloc_init();
 
     acpi_init(_k_init_mb_info);
     apic_init();
@@ -127,11 +148,10 @@ init_platform()
     clock_init();
     ps2_kbd_init();
     pci_init();
+    block_init();
     ahci_init();
-    pci_print_device();
-    ahci_list_device();
-
-    cake_stats();
+    // ahci_list_device();
+    // cake_stats();
 
     syscall_install();