feat: kprintf now goes into dedicated pseudo-dev rather than flooding the framebuffer

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

diff --git a/lunaix-os/kernel/kinit.c b/lunaix-os/kernel/kinit.c
index 607ba20a9d6aea6bcdb4bb11d05d978c4e9ca0d1..0510c0c53de0d7be781c04374eb4b0baa3ba3159 100644 (file)
--- 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/block.h>
 #include <lunaix/boot_generic.h>

-#include <lunaix/common.h>

 #include <lunaix/device.h>
 #include <lunaix/foptions.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/device.h>
 #include <lunaix/foptions.h>
 #include <lunaix/fs/twifs.h>


@@ -21,13 +20,12 @@
 
 #include <hal/acpi/acpi.h>
 #include <hal/intc.h>
 
 #include <hal/acpi/acpi.h>
 #include <hal/intc.h>

-#include <hal/pci.h>

 
 #include <sys/abi.h>
 #include <sys/interrupts.h>
 #include <sys/mm/mempart.h>
 
 
 #include <sys/abi.h>
 #include <sys/interrupts.h>
 #include <sys/mm/mempart.h>
 

-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>

 #include <klibc/string.h>
 
 extern void
 #include <klibc/string.h>
 
 extern void


@@ -54,30 +52,45 @@ kernel_bootstrap(struct boot_handoff* bhctx)
     /* Prepare stack trace environment */
     trace_modksyms_init(bhctx);
 
     /* Prepare stack trace environment */
     trace_modksyms_init(bhctx);
 

+    device_scan_drivers();
+

     // crt
     // 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();
 
     /* Get platform configuration */
     acpi_init();
 
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
     lxconsole_init();
 
     /* Get platform configuration */
     acpi_init();
 

+    /* Get intc online, this is the cornerstone when initing devices */
+    intc_init();
+
+    /*
+        TODO autoload these init function that do not have dependency between
+       them
+    */
+

     /* Let's get fs online as soon as possible, as things rely on them */
     vfs_init();
     fsm_init();
     input_init();
     /* Let's get fs online as soon as possible, as things rely on them */
     vfs_init();
     fsm_init();
     input_init();

+    block_init();
+    sched_init();

 
 

-    /* Get intc online, this is the cornerstone when initing devices */
-    intc_init();
+    device_earlystage();

 
     /* System timing and clock support */
 
     /* System timing and clock support */

-    clock_init();
-    timer_init();
+    /*
+        FIXME we must get timer as earlier as possible

 
 

-    block_init();
+        A decoupling between rtc and general device sub-sys is needed.
+        Otherwise we timer can only be loaded after device_earlystage.
+
+        We need a dedicated timer&clock subsystem
+    */
+    timer_init();

 
     /* the bare metal are now happy, let's get software over with */
 
     /* the bare metal are now happy, let's get software over with */

-    sched_init();

 
     int errno = 0;
     if ((errno = vfs_mount_root("ramfs", NULL))) {
 
     int errno = 0;
     if ((errno = vfs_mount_root("ramfs", NULL))) {


@@ -89,9 +102,6 @@ kernel_bootstrap(struct boot_handoff* bhctx)
     vfs_mount("/sys", "twifs", NULL, MNT_RO);
     vfs_mount("/task", "taskfs", NULL, MNT_RO);
 
     vfs_mount("/sys", "twifs", NULL, MNT_RO);
     vfs_mount("/task", "taskfs", NULL, MNT_RO);
 

-    lxconsole_spawn_ttydev();
-    device_init_builtin();
-

     /* Finish up bootstrapping sequence, we are ready to spawn the root process
      * and start geting into uspace
      */
     /* Finish up bootstrapping sequence, we are ready to spawn the root process
      * and start geting into uspace
      */


@@ -138,16 +148,12 @@ spawn_proc0()
     cpu_chvmspace(proc0->page_table);
 
     // 为内核创建一个专属栈空间。
     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);
         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);
 
     // 向调度器注册进程。
     commit_process(proc0);