X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/7c7b5f05d39b7739d990f71256a2267ec67a6913..1375eb51603466b723ab7dd1ca4194ee5d662f75:/lunaix-os/kernel/proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 3c7b225..31a100d 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -10,7 +10,6 @@
 #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>
@@ -19,8 +18,6 @@
 
 #include <sdbg/protocol.h>
 
-#include <hal/pci.h>
-
 #include <klibc/string.h>
 
 LOG_MODULE("PROC0")
@@ -35,12 +32,12 @@ mount_bootmedium()
     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))) {
-        kprintf(KERROR "fail to mount boot medium. (%d)", errno);
+        ERROR("fail to mount boot medium. (%d)", errno);
         return 0;
     }
 
@@ -59,7 +56,7 @@ exec_initd()
     fail("should not reach");
 
 fail:
-    kprintf(KERROR "fail to load initd. (%d)", errno);
+    ERROR("fail to load initd. (%d)", errno);
     return 0;
 }
 
@@ -95,24 +92,12 @@ __proc0()
 void
 init_platform()
 {
-    kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
-            __VERSION__,
-            __TIME__);
+    device_postboot_load();
 
     twifs_register_plugins();
 
-    /*
-     * all device registering and loading must defered to here!
-     * due to limited stack size and partial scheduling context
-     */
-    pci_load_devices();
-
-    // debugger
-    serial_init();
-    sdbg_init();
-
-    // FIXME ps2 kbd is a device, must not be here
-    ps2_kbd_init();
+    // FIXME Re-design needed!!
+    // sdbg_init();
 
     // console
     console_start_flushing();