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

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

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 64dbcd9a4520d9c713db77f671111057a748ff44..31a100df9c33333749a12e9378e5b79b48573ea4 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.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/exec.h>
 #include <lunaix/foptions.h>
 #include <lunaix/fs.h>
 #include <lunaix/exec.h>
 #include <lunaix/foptions.h>
 #include <lunaix/fs.h>


@@ -11,7 +10,6 @@
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/vmm.h>

-#include <lunaix/peripheral/ps2kbd.h>

 #include <lunaix/peripheral/serial.h>
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>
 #include <lunaix/peripheral/serial.h>
 #include <lunaix/spike.h>
 #include <lunaix/syscall.h>


@@ -20,10 +18,6 @@
 
 #include <sdbg/protocol.h>
 
 
 #include <sdbg/protocol.h>
 

-#include <hal/acpi/acpi.h>
-#include <hal/ahci/ahci.h>
-#include <hal/pci.h>
-

 #include <klibc/string.h>
 
 LOG_MODULE("PROC0")
 #include <klibc/string.h>
 
 LOG_MODULE("PROC0")


@@ -38,12 +32,12 @@ mount_bootmedium()
     int errno = 0;
     struct device* dev = probe_boot_medium();
     if (!dev) {
     int errno = 0;
     struct device* dev = probe_boot_medium();
     if (!dev) {

-        kprintf(KERROR "fail to acquire device. (%d)", errno);
+        ERROR("fail to acquire device. (%d)", errno);

         return 0;
     }
 
     if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {
         return 0;
     }
 
     if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {

-        kprintf(KERROR "fail to mount boot medium. (%d)", errno);
+        ERROR("fail to mount boot medium. (%d)", errno);

         return 0;
     }
 
         return 0;
     }
 


@@ -62,7 +56,7 @@ exec_initd()
     fail("should not reach");
 
 fail:
     fail("should not reach");
 
 fail:

-    kprintf(KERROR "fail to load initd. (%d)", errno);
+    ERROR("fail to load initd. (%d)", errno);

     return 0;
 }
 
     return 0;
 }
 


@@ -78,8 +72,8 @@ void
 __proc0()
 {
     /*
 __proc0()
 {
     /*

-     * We must defer boot code/data cleaning after we successfully escape that
-     * area
+     * We must defer boot code/data cleaning to here, after we successfully
+     * escape that area

      */
     boot_cleanup();
 
      */
     boot_cleanup();
 


@@ -98,22 +92,12 @@ __proc0()
 void
 init_platform()
 {
 void
 init_platform()
 {

-    kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
-            __VERSION__,
-            __TIME__);
+    device_postboot_load();

 
     twifs_register_plugins();
 
 
     twifs_register_plugins();
 

-    /* we must start probing pci after all drivers are registered! */
-    pci_load_devices();
-
-    // debugger
-    serial_init();
-    sdbg_init();
-
-    // FIXME ps2 kbd is x86 PC specific, not here.
-    // peripherals & chipset features
-    ps2_kbd_init();
+    // FIXME Re-design needed!!
+    // sdbg_init();

 
     // console
     console_start_flushing();
 
     // console
     console_start_flushing();