summaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-04-08 11:49:51 -0400
committerFreya Murphy <freya@freyacat.org>2025-04-08 11:49:51 -0400
commit76ea83e70c5c852de9efdf857f6ee95be7d6e6c8 (patch)
tree0f00ac8591bc2978b0f4e82cf23033f4a677f306 /kernel/main.c
parentfix old checkout (diff)
downloadcomus-76ea83e70c5c852de9efdf857f6ee95be7d6e6c8.tar.gz
comus-76ea83e70c5c852de9efdf857f6ee95be7d6e6c8.tar.bz2
comus-76ea83e70c5c852de9efdf857f6ee95be7d6e6c8.zip
acpi
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();