X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/77e7b21f117eecd04bb31257ee68dfc1f425a47e..96e23fa3c6eabf8a6efebac24b740c5d4a2a1050:/lunaix-os/kernel/proc0.c?ds=sidebyside

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 4cf0c82..32e1eff 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,5 +1,6 @@
-#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>
@@ -13,13 +14,16 @@
 #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/rtc.h>
+
+#include <arch/x86/boot/multiboot.h>
 
 #include <klibc/string.h>
 
@@ -42,7 +46,8 @@ __do_reserved_memory(int unlock);
 
 #define USE_DEMO
 // #define DEMO_SIGNAL
-#define DEMO_READDIR
+//#define DEMO_READDIR
+#define DEMO_IOTEST
 
 extern void
 _pconsole_main();
@@ -56,9 +61,18 @@ _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();
@@ -71,9 +85,12 @@ __proc0_usr()
         _signal_demo_main();
 #elif defined DEMO_READDIR
         _readdir_main();
+#elif defined DEMO_IOTEST
+        _iotest_main();
 #else
         _lxinit_main();
 #endif
+        _exit(0);
     }
 
     waitpid(p, 0, 0);
@@ -119,48 +136,16 @@ extern uint8_t __kernel_end;              /* link/linker.ld */
 extern uint8_t __init_hhk_end;            /* link/linker.ld */
 extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 
-char test_sequence[] = "Once upon a time, in a magical land of Equestria. "
-                       "There were two regal sisters who ruled together "
-                       "and created harmony for all the land.";
-
-void
-__test_disk_io()
-{
-    struct hba_port* port = ahci_get_port(0);
-    struct hba_device* dev = port->device;
-    char* buffer = vzalloc_dma(port->device->block_size);
-    strcpy(buffer, test_sequence);
-    kprintf("WRITE: %s\n", buffer);
-    int result;
-
-    // 写入第一扇区 (LBA=0)
-    result = dev->ops.write_buffer(dev, 0, buffer, dev->block_size);
-    if (!result) {
-        kprintf(KWARN "fail to write: %x\n", dev->last_error);
-    }
-
-    memset(buffer, 0, dev->block_size);
-
-    // 读出我们刚刚写的内容！
-    result = dev->ops.read_buffer(dev, 0, buffer, dev->block_size);
-    kprintf(KDEBUG "%x, %x\n", port->regs[HBA_RPxIS], port->regs[HBA_RPxTFD]);
-    if (!result) {
-        kprintf(KWARN "fail to read: %x\n", dev->last_error);
-    } else {
-        kprint_hex(buffer, 256);
-    }
-
-    vfree_dma(buffer);
-}
-
 void
 init_platform()
 {
     // 锁定所有系统预留页（内存映射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();
@@ -168,17 +153,9 @@ init_platform()
     clock_init();
     ps2_kbd_init();
     pci_init();
+    block_init();
     ahci_init();
     // ahci_list_device();
-
-    fsm_init();
-    vfs_init();
-    twifs_init();
-
-    vfs_mount("/", "twifs", -1);
-
-    //__test_disk_io();
-
     // cake_stats();
 
     syscall_install();