feat: implement readlink(2) readlinkat(2)

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index bef7bb7316f896afa4cc8e77c90cdcada4ec672d..3aa402ed42d16befb2ccb9dec032d7832244fdc4 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,5 +1,8 @@
 #include <arch/x86/boot/multiboot.h>
 #include <arch/x86/boot/multiboot.h>

+#include <lunaix/block.h>

 #include <lunaix/common.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/lunistd.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>


@@ -14,11 +17,13 @@
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>
 #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 <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/pci.h>
 

+#include <klibc/string.h>
+

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


@@ -36,8 +41,10 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
 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();
 
 extern void
 _pconsole_main();


@@ -48,6 +55,12 @@ _signal_demo_main();
 extern void
 _lxinit_main();
 
 extern void
 _lxinit_main();
 

+extern void
+_readdir_main();
+
+extern void
+_iotest_main();
+

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


@@ -61,6 +74,10 @@ __proc0_usr()
         _exit(0);
 #elif defined DEMO_SIGNAL
         _signal_demo_main();
         _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
 #else
         _lxinit_main();
 #endif


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

-    cake_init();
-

     assert_msg(kalloc_init(), "Fail to initialize heap");
     assert_msg(kalloc_init(), "Fail to initialize heap");

-    valloc_init();

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


@@ -127,11 +141,10 @@ init_platform()
     clock_init();
     ps2_kbd_init();
     pci_init();
     clock_init();
     ps2_kbd_init();
     pci_init();

+    block_init();

     ahci_init();
     ahci_init();

-    pci_print_device();
-    ahci_list_device();
-
-    cake_stats();
+    // ahci_list_device();
+    // cake_stats();

 
     syscall_install();
 
 
     syscall_install();