feat: (iso9660) directory read support

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index f926ffda7df7926c6a063aabdaab1f0fa7b36898..19f04dce4d077b59bcd7c47099071ee5dc69d7b7 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,8 +1,10 @@
 #include <lunaix/block.h>
 #include <lunaix/common.h>
 #include <lunaix/fctrl.h>
+#include <lunaix/foptions.h>
 #include <lunaix/fs.h>
 #include <lunaix/fs/twifs.h>
+#include <lunaix/lunaix.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>
@@ -10,12 +12,14 @@
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
-#include <lunaix/proc.h>
+#include <lunaix/peripheral/serial.h>
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/types.h>
 
+#include <sdbg/protocol.h>
+
 #include <hal/acpi/acpi.h>
 #include <hal/ahci/ahci.h>
 #include <hal/apic.h>
@@ -50,7 +54,8 @@ __do_reserved_memory(int unlock);
 // #define DEMO_SIGNAL
 // #define DEMO_READDIR
 // #define DEMO_IOTEST
-#define DEMO_INPUT_TEST
+// #define DEMO_INPUT_TEST
+#define DEMO_SIMPLE_SH
 
 extern void
 _pconsole_main();
@@ -70,6 +75,21 @@ _iotest_main();
 extern void
 input_test();
 
+extern void
+sh_main();
+
+void __USER__
+__setup_dir()
+{
+    int errno;
+    mkdir("/mnt");
+    mkdir("/mnt/lunaix-os");
+
+    if ((errno = mount("/dev/sdb", "/mnt/lunaix-os", "iso9660", 0))) {
+        syslog(2, "fail mounting boot medium. (%d)\n", errno);
+    }
+}
+
 void __USER__
 __proc0_usr()
 {
@@ -79,10 +99,9 @@ __proc0_usr()
     int fdstdout = open("/dev/tty", 0);
     int fdstdin = dup2(stdout, 1);
 
+    __setup_dir();
+
     pid_t p;
-    // if (!fork()) {
-    //     _pconsole_main();
-    // }
 
     if (!(p = fork())) {
 #ifndef USE_DEMO
@@ -95,6 +114,8 @@ __proc0_usr()
         _iotest_main();
 #elif defined DEMO_INPUT_TEST
         input_test();
+#elif defined DEMO_SIMPLE_SH
+        sh_main();
 #else
         _lxinit_main();
 #endif
@@ -124,6 +145,7 @@ __proc0()
 
     init_proc_user_space(__current);
 
+    // user space
     asm volatile("movw %0, %%ax\n"
                  "movw %%ax, %%es\n"
                  "movw %%ax, %%ds\n"
@@ -148,27 +170,46 @@ extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 void
 init_platform()
 {
+    kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
+            __VERSION__,
+            __TIME__);
+
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
-    rtc_init();
+    // firmware
     acpi_init(_k_init_mb_info);
+
+    // die
     apic_init();
     ioapic_init();
+
+    // debugger
+    serial_init();
+    sdbg_init();
+
+    // timers & clock
+    rtc_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
+
+    // peripherals & chipset features
     ps2_kbd_init();
-    pci_init();
     block_init();
     ahci_init();
 
-    syscall_install();
+    pci_init();
 
+    // console
     console_start_flushing();
     console_flush();
 
+    // expose cake allocator states to vfs
+    cake_export();
+
     unlock_reserved_memory();
 
+    // clean up
     for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
         vmm_del_mapping(PD_REFERENCED, (void*)i);
         pmm_free_page(KERNEL_PID, (void*)i);
@@ -204,6 +245,10 @@ __do_reserved_memory(int unlock)
         size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
         size_t j = 0;
         if (!unlock) {
+            kprintf("mem: freeze: %p..%p type=%x\n",
+                    pa,
+                    pa + pg_num * PG_SIZE,
+                    mmap.type);
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 if (_pa >= KERNEL_MM_BASE) {
@@ -217,6 +262,10 @@ __do_reserved_memory(int unlock)
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
         } else {
+            kprintf("mem: reclaim: %p..%p type=%x\n",
+                    pa,
+                    pa + pg_num * PG_SIZE,
+                    mmap.type);
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(PD_REFERENCED, _pa);