git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: better rtc framework which aims to remove single rtc restrictions.
[lunaix-os.git]
/
lunaix-os
/
kernel
/
proc0.c
diff --git
a/lunaix-os/kernel/proc0.c
b/lunaix-os/kernel/proc0.c
index 64dbcd9a4520d9c713db77f671111057a748ff44..c7501af0e733c0769a23cd95fd2267d0dbfe9bd5 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,8
+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>
#include <hal/pci.h>
#include <klibc/string.h>
@@
-78,8
+74,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();
@@
-104,17
+100,16
@@
init_platform()
twifs_register_plugins();
twifs_register_plugins();
- /* we must start probing pci after all drivers are registered! */
+ /*
+ * 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();
pci_load_devices();
// debugger
serial_init();
sdbg_init();
- // FIXME ps2 kbd is x86 PC specific, not here.
- // peripherals & chipset features
- ps2_kbd_init();
-
// console
console_start_flushing();
console_flush();
// console
console_start_flushing();
console_flush();