summaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/kernel/main.c b/kernel/main.c
index 5b06ae2..4f91d95 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -5,21 +5,16 @@
#include <comus/fs.h>
#include <lib.h>
-struct memory_map mmap;
-
void main(long magic, volatile void *mboot)
{
- (void)magic; // TODO: check multiboot magic
-
// initalize idt and pic
- // WARNING: must be done before anything else
cpu_init();
- // load memory map
- mboot_load_mmap(mboot, &mmap);
+ // load multiboot information
+ mboot_init(magic, mboot);
// initalize memory
- memory_init(&mmap);
+ memory_init();
// initalize devices
drivers_init();