X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/839da03f6ebe838d780e52190318d4c3048990f1..90129c6876c9bac2e468ab82c8264352d1952b4d:/lunaix-os/kernel/proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 3a6ea62..3aa402e 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,8 +1,13 @@
 #include <arch/x86/boot/multiboot.h>
+#include <lunaix/block.h>
 #include <lunaix/common.h>
+#include <lunaix/fs.h>
+#include <lunaix/fs/twifs.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>
+#include <lunaix/mm/cake.h>
 #include <lunaix/mm/pmm.h>
+#include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/proc.h>
@@ -12,11 +17,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
@@ -34,8 +41,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();
@@ -46,6 +55,12 @@ _signal_demo_main();
 extern void
 _lxinit_main();
 
+extern void
+_readdir_main();
+
+extern void
+_iotest_main();
+
 void __USER__
 __proc0_usr()
 {
@@ -59,6 +74,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
@@ -110,11 +129,11 @@ extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 void
 init_platform()
 {
-    assert_msg(kalloc_init(), "Fail to initialize heap");
-
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
+    assert_msg(kalloc_init(), "Fail to initialize heap");
+
     acpi_init(_k_init_mb_info);
     apic_init();
     ioapic_init();
@@ -122,9 +141,10 @@ init_platform()
     clock_init();
     ps2_kbd_init();
     pci_init();
+    block_init();
     ahci_init();
-    pci_print_device();
-    ahci_list_device();
+    // ahci_list_device();
+    // cake_stats();
 
     syscall_install();