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
fix: corner cases when printing large content through term interface
[lunaix-os.git]
/
lunaix-os
/
kernel
/
kinit.c
diff --git
a/lunaix-os/kernel/kinit.c
b/lunaix-os/kernel/kinit.c
index f5944b50a90b6e9cbdf16c0f147a04f1ede590bb..a54b68a7adaf0e76ecc9e9410d0376ea9796e54a 100644
(file)
--- a/
lunaix-os/kernel/kinit.c
+++ b/
lunaix-os/kernel/kinit.c
@@
-1,10
+1,10
@@
+#include <lunaix/types.h>
#include <lunaix/block.h>
#include <lunaix/boot_generic.h>
#include <lunaix/device.h>
#include <lunaix/foptions.h>
#include <lunaix/fs/twifs.h>
#include <lunaix/input.h>
#include <lunaix/block.h>
#include <lunaix/boot_generic.h>
#include <lunaix/device.h>
#include <lunaix/foptions.h>
#include <lunaix/fs/twifs.h>
#include <lunaix/input.h>
-#include <lunaix/lxconsole.h>
#include <lunaix/mm/cake.h>
#include <lunaix/mm/mmio.h>
#include <lunaix/mm/page.h>
#include <lunaix/mm/cake.h>
#include <lunaix/mm/mmio.h>
#include <lunaix/mm/page.h>
@@
-16,7
+16,7
@@
#include <lunaix/spike.h>
#include <lunaix/trace.h>
#include <lunaix/tty/tty.h>
#include <lunaix/spike.h>
#include <lunaix/trace.h>
#include <lunaix/tty/tty.h>
-#include <lunaix/
type
s.h>
+#include <lunaix/
owloysiu
s.h>
#include <hal/acpi/acpi.h>
#include <hal/intc.h>
#include <hal/acpi/acpi.h>
#include <hal/intc.h>
@@
-25,7
+25,7
@@
#include <sys/interrupts.h>
#include <sys/mm/mempart.h>
#include <sys/interrupts.h>
#include <sys/mm/mempart.h>
-#include <klibc/st
dio
.h>
+#include <klibc/st
rfmt
.h>
#include <klibc/string.h>
extern void
#include <klibc/string.h>
extern void
@@
-49,49
+49,49
@@
kernel_bootstrap(struct boot_handoff* bhctx)
/* Setup kernel memory layout and services */
kmem_init(bhctx);
/* Setup kernel memory layout and services */
kmem_init(bhctx);
+ boot_parse_cmdline(bhctx);
+
/* Prepare stack trace environment */
trace_modksyms_init(bhctx);
/* Prepare stack trace environment */
trace_modksyms_init(bhctx);
- device_
register_all
();
+ device_
scan_drivers
();
- // crt
+ invoke_init_function(on_earlyboot);
+
+ // FIXME this goes to hal/gfxa
tty_init(ioremap(0xB8000, PG_SIZE));
tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
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();
- input_init();
- device_earlystage();
-
- /* System timing and clock support */
clock_init();
timer_init();
clock_init();
timer_init();
- device_timerstage();
+ /*
+ 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();
block_init();
+ sched_init();
+
+ device_onboot_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);
- }
+
must_success(vfs_mount_root("ramfs", NULL))
;
+ must_success(vfs_mount("/dev", "devfs", NULL, 0));
+
+ invoke_init_function(on_boot);
- /* 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);
+ must_success(vfs_unmount("/dev"));
/* 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