X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/9b8e0c494de6b447b44454112748f702dffec90d..986ce23ace2f7875a1a561bd947f435a7594146c:/lunaix-os/kernel/proc0.c?ds=sidebyside

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 6f39299..d765691 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,7 +1,9 @@
 #include <lunaix/block.h>
 #include <lunaix/common.h>
+#include <lunaix/exec.h>
 #include <lunaix/foptions.h>
 #include <lunaix/fs.h>
+#include <lunaix/fs/probe_boot.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>
@@ -15,10 +17,6 @@
 #include <lunaix/syslog.h>
 #include <lunaix/types.h>
 
-#include <usr/fcntl.h>
-#include <usr/sys/lunaix.h>
-#include <usr/unistd.h>
-
 #include <sdbg/protocol.h>
 
 #include <hal/acpi/acpi.h>
@@ -32,13 +30,8 @@
 
 #include <klibc/string.h>
 
-#include <ulibc/stdio.h>
-
 LOG_MODULE("PROC0")
 
-extern void
-_lxinit_main(); /* lxinit.c */
-
 void
 init_platform();
 
@@ -51,84 +44,39 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
-#define USE_DEMO
-// #define DEMO_SIGNAL
-// #define DEMO_READDIR
-// #define DEMO_IOTEST
-// #define DEMO_INPUT_TEST
-#define DEMO_SIMPLE_SH
-
-extern void
-_pconsole_main();
-
-extern void
-_signal_demo_main();
-
-extern void
-_lxinit_main();
-
-extern void
-_readdir_main();
-
-extern void
-_iotest_main();
-
-extern void
-input_test();
-
-extern void
-sh_main();
-
-void __USER__
-__setup_dir()
+int
+mount_bootmedium()
 {
-    int errno;
-    mkdir("/mnt");
-    mkdir("/mnt/lunaix-os");
+    struct v_dnode* dnode;
+    int errno = 0;
+    struct device* dev = probe_boot_medium();
+    if (!dev) {
+        kprintf(KERROR "fail to acquire device. (%d)", errno);
+        return 0;
+    }
 
-    if ((errno = mount("/dev/sdb", "/mnt/lunaix-os", "iso9660", 0))) {
-        syslog(2, "fail mounting boot medium. (%d)\n", errno);
+    if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {
+        kprintf(KERROR "fail to mount boot medium. (%d)", errno);
+        return 0;
     }
+
+    return 1;
 }
 
-void __USER__
-__proc0_usr()
+int
+exec_initd()
 {
-    // 打开tty设备(控制台)，作为标准输入输出。
-    //  tty设备属于序列设备（Sequential Device），该类型设备的上层读写
-    //  无须经过Lunaix的缓存层，而是直接下发到底层驱动。（不受FO_DIRECT的影响）
-    int fdstdout = open("/dev/tty", 0);
-    int fdstdin = dup2(stdout, 1);
-
-    __setup_dir();
-
-    pid_t p;
-
-    if (!(p = fork())) {
-#ifndef USE_DEMO
-        _exit(0);
-#elif defined DEMO_SIGNAL
-        _signal_demo_main();
-#elif defined DEMO_READDIR
-        _readdir_main();
-#elif defined DEMO_IOTEST
-        _iotest_main();
-#elif defined DEMO_INPUT_TEST
-        input_test();
-#elif defined DEMO_SIMPLE_SH
-        sh_main();
-#else
-        _lxinit_main();
-#endif
-        printf("==== test end ====\n");
-        _exit(0);
+    int errno = 0;
+
+    if (exec_kexecve("/mnt/lunaix-os/usr/init", NULL, NULL)) {
+        goto fail;
     }
 
-    waitpid(p, 0, 0);
+    fail("should not reach");
 
-    while (1) {
-        yield();
-    }
+fail:
+    kprintf(KERROR "fail to load initd. (%d)", errno);
+    return 0;
 }
 
 /**
@@ -146,21 +94,12 @@ __proc0()
 
     init_proc_user_space(__current);
 
-    // user space
-    asm volatile("movw %0, %%ax\n"
-                 "movw %%ax, %%es\n"
-                 "movw %%ax, %%ds\n"
-                 "movw %%ax, %%fs\n"
-                 "movw %%ax, %%gs\n"
-                 "pushl %0\n"
-                 "pushl %1\n"
-                 "pushl %2\n"
-                 "pushl %3\n"
-                 "retf" ::"i"(UDATA_SEG),
-                 "i"(USTACK_TOP & ~0xf),
-                 "i"(UCODE_SEG),
-                 "r"(__proc0_usr)
-                 : "eax", "memory");
+    if (!mount_bootmedium() || !exec_initd()) {
+        while (1) {
+            asm("hlt");
+        }
+        // should not reach
+    }
 }
 
 extern uint8_t __kernel_start;            /* link/linker.ld */