1 files changed, 27 insertions, 13 deletions

diff --git a/src/kernel/arch/i386/boot.c b/src/kernel/arch/i386/boot.c
index a3716ee..be80f73 100644
--- a/src/kernel/arch/i386/boot.c
+++ b/src/kernel/arch/i386/boot.c
@@ -1,19 +1,34 @@
 #include <kernel/arch/generic.h>
 #include <kernel/arch/i386/ata.h>
 #include <kernel/arch/i386/boot.h>
+#include <kernel/arch/i386/driver/ps2.h>
+#include <kernel/arch/i386/driver/serial.h>
 #include <kernel/arch/i386/gdt.h>
 #include <kernel/arch/i386/interrupts/idt.h>
 #include <kernel/arch/i386/interrupts/irq.h>
 #include <kernel/arch/i386/multiboot.h>
 #include <kernel/main.h>
+#include <kernel/mem/alloc.h>
 #include <kernel/panic.h>
+#include <kernel/vfs/root.h>
 
 void tty_init(void); // TODO put this in a header file
 
+static void find_init(struct multiboot_info *multiboot, struct kmain_info *info)
+{
+	struct multiboot_mod *module = &multiboot->mods[0];
+	if (multiboot->mods_count < 1) {
+		kprintf("can't find init! ");
+		panic_invalid_state();
+	}
+	info->init.at   = module->start;
+	info->init.size = module->end - module->start;
+
+}
+
 void kmain_early(struct multiboot_info *multiboot) {
 	struct kmain_info info;
 
-	// setup some basic stuff
 	tty_init();
 	kprintf("gdt...");
 	gdt_init();
@@ -21,20 +36,19 @@ void kmain_early(struct multiboot_info *multiboot) {
 	idt_init();
 	kprintf("irq...");
 	irq_init();
-	kprintf("ata...");
-	ata_init();
-
-	{ // find the init module
-		struct multiboot_mod *module = &multiboot->mods[0];
-		if (multiboot->mods_count < 1) {
-			kprintf("can't find init! ");
-			panic_invalid_state(); // no init
-		}
-		info.init.at   = module->start;
-		info.init.size = module->end - module->start;
-	}
 
 	info.memtop = (void*) (multiboot->mem_upper * 1024);
+	find_init(multiboot, &info);
+	kprintf("mem...\n");
+	mem_init(&info);
+
+	kprintf("rootfs...");
+	vfs_root_init();
+	ps2_init();
+	serial_init();
+
+	kprintf("ata...");
+	ata_init();
 
 	kmain(info);
 }