refactor: make pci device driver loading passive, pci bus scanner will not load them...

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

diff --git a/lunaix-os/kernel/kinit.c b/lunaix-os/kernel/kinit.c
index 046054472f7b97d74005ca846c0efa5c41e30085..501c8f45a14063c34454d2d223785b18e48d7982 100644 (file)
--- a/lunaix-os/kernel/kinit.c
+++ b/lunaix-os/kernel/kinit.c
@@ -20,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


@@ -53,44 +52,42 @@ 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
     tty_init(ioremap(0xB8000, PG_SIZE));
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
     lxconsole_init();
 
     // crt
     tty_init(ioremap(0xB8000, PG_SIZE));
     tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
     lxconsole_init();
 

-    /* Get platform configuration */
-    acpi_init();
-
-    /* Let's get fs online as soon as possible, as things rely on them */
-    vfs_init();
-    fsm_init();
+    device_sysconf_load();

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

-    /* System timing and clock support */

     clock_init();
     timer_init();
 
     clock_init();
     timer_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();
     block_init();
     input_init();
     block_init();

+    sched_init();
+
+    device_onbooot_load();

 
     /* 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))) {
         panickf("Fail to mount root. (errno=%d)", errno);
     }
 
 
     int errno = 0;
     if ((errno = vfs_mount_root("ramfs", NULL))) {
         panickf("Fail to mount root. (errno=%d)", errno);
     }
 

-    /* Mount these system-wide pseudo-fs */
-    vfs_mount("/dev", "devfs", NULL, 0);
-    vfs_mount("/sys", "twifs", NULL, MNT_RO);
-    vfs_mount("/task", "taskfs", NULL, MNT_RO);
-
-    lxconsole_spawn_ttydev();
-    device_install_pseudo();
-

     /* 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
      */