From 8d78616a2b80c7625c1aa9ca4733e48a8bf8bf22 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 18 Apr 2020 00:07:37 +0200 Subject: Completely reworked ACPI tables I'm too exhausted right now, but I rediscovered the memory mapping issue of my ACPI implementatio and need to fix it ASAP. Otherwise I won't be able to use any ACPI table without causing a page fault. I have no clue why exactly this is happening and the internet says that I shouldn't need to memory map them. Well, I'll look into it later. --- src/kernel/kernel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/kernel/kernel.c') diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 144ae8c..40d11b9 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -18,6 +18,7 @@ #include #include #include +#include void kernel_main(uint32_t magic, uint32_t multiboot_address) { @@ -36,15 +37,13 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address) // Install features gdt_install(); init_serial(); - acpi_install(); idt_install(); isrs_install(); irq_install(); + multiboot_parse(multiboot_address); paging_install(); - memory_print(); - // Install drivers cli(); timer_install(); @@ -54,6 +53,9 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address) network_install(); sti(); + memory_print(); + //rtc_print(); // TODO: Fix ACPI memory mapping! + vfs_init(); ata_init(); ext2_init("/dev/hda", "/"); -- cgit v1.2.3