feat: rename(2), mount(2) and unmount(2)

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 3aa402ed42d16befb2ccb9dec032d7832244fdc4..3c2ea5f3b91be794c9fa306c29439f05f8bc6841 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,13 +14,16 @@
 #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>
 


@@ -43,8 +46,8 @@ __do_reserved_memory(int unlock);
 
 #define USE_DEMO
 // #define DEMO_SIGNAL
 
 #define USE_DEMO
 // #define DEMO_SIGNAL

-#define DEMO_READDIR
-//#define DEMO_IOTEST
+// #define DEMO_READDIR
+#define DEMO_IOTEST

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


@@ -64,6 +67,12 @@ _iotest_main();
 void __USER__
 __proc0_usr()
 {
 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();
     pid_t p;
     if (!fork()) {
         _pconsole_main();


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

-    assert_msg(kalloc_init(), "Fail to initialize heap");
+    // we are using no kalloc!
+    // 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();