X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/1fe5f5eb5378a47bf0f3451762743c162e40faad..f6ab9c9ababa2cf6e5c723b83ffb9362094054e8:/lunaix-os/kernel/kinit.c

diff --git a/lunaix-os/kernel/kinit.c b/lunaix-os/kernel/kinit.c
index 607ba20..0460544 100644
--- a/lunaix-os/kernel/kinit.c
+++ b/lunaix-os/kernel/kinit.c
@@ -1,6 +1,5 @@
 #include <lunaix/block.h>
 #include <lunaix/boot_generic.h>
-#include <lunaix/common.h>
 #include <lunaix/device.h>
 #include <lunaix/foptions.h>
 #include <lunaix/fs/twifs.h>
@@ -55,7 +54,7 @@ kernel_bootstrap(struct boot_handoff* bhctx)
     trace_modksyms_init(bhctx);
 
     // crt
-    tty_init(ioremap(VGA_FRAMEBUFFER, PG_SIZE));
+    tty_init(ioremap(0xB8000, PG_SIZE));
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
     lxconsole_init();
 
@@ -65,7 +64,6 @@ kernel_bootstrap(struct boot_handoff* bhctx)
     /* Let's get fs online as soon as possible, as things rely on them */
     vfs_init();
     fsm_init();
-    input_init();
 
     /* Get intc online, this is the cornerstone when initing devices */
     intc_init();
@@ -74,6 +72,7 @@ kernel_bootstrap(struct boot_handoff* bhctx)
     clock_init();
     timer_init();
 
+    input_init();
     block_init();
 
     /* the bare metal are now happy, let's get software over with */
@@ -90,7 +89,7 @@ kernel_bootstrap(struct boot_handoff* bhctx)
     vfs_mount("/task", "taskfs", NULL, MNT_RO);
 
     lxconsole_spawn_ttydev();
-    device_init_builtin();
+    device_install_pseudo();
 
     /* Finish up bootstrapping sequence, we are ready to spawn the root process
      * and start geting into uspace
@@ -138,16 +137,12 @@ spawn_proc0()
     cpu_chvmspace(proc0->page_table);
 
     // 为内核创建一个专属栈空间。
-    for (size_t i = 0; i < (KSTACK_SIZE >> PG_SIZE_BITS); i++) {
+    for (size_t i = 0; i < KERNEL_STACK_SIZE; i += PG_SIZE) {
         ptr_t pa = pmm_alloc_page(KERNEL_PID, 0);
-        vmm_set_mapping(VMS_SELF,
-                        KSTACK_START + (i << PG_SIZE_BITS),
-                        pa,
-                        PG_PREM_RW,
-                        VMAP_NULL);
+        vmm_set_mapping(VMS_SELF, KERNEL_STACK + i, pa, PG_PREM_RW, VMAP_NULL);
     }
 
-    proc_init_transfer(proc0, KSTACK_TOP, (ptr_t)__proc0, 0);
+    proc_init_transfer(proc0, KERNEL_STACK_END, (ptr_t)__proc0, 0);
 
     // 向调度器注册进程。
     commit_process(proc0);