aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2020-04-18 00:07:37 +0200
committerMarvin Borner2020-04-18 00:07:37 +0200
commit8d78616a2b80c7625c1aa9ca4733e48a8bf8bf22 (patch)
tree894bddb357ca1976fcfd3b54d1e8fe48bbac569b /src/kernel/kernel.c
parent27c38d3f6e473d2bf7075fb364db148f22aca203 (diff)
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.
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c8
1 files changed, 5 insertions, 3 deletions
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 <kernel/fs/ata.h>
#include <kernel/fs/ext2.h>
#include <kernel/fs/vfs.h>
+#include <kernel/cmos/rtc.h>
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", "/");