aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2019-10-14 17:20:25 +0200
committerMarvin Borner2019-10-14 17:20:25 +0200
commitaca116a82c7b9ef715ec9e7ed6d2f97d56715327 (patch)
tree7bac857da5f8244cc08adffc4660bacf4f27a73f /src/kernel/kernel.c
parent8754542ce074bef0984f91ce1b1cd8aff9b3d5e9 (diff)
Trying some things
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index da0b18b..d96ea00 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -9,20 +9,20 @@
#include "paging/kheap.h"
void init() {
- initialise_paging();
timer_install();
gdt_install();
idt_install();
isrs_install();
irq_install();
+ initialise_paging();
init_serial();
// terminal_initialize(); // TODO: Replace VGA functions with VESA
asm volatile ("sti");
}
void kernel_main(void) {
- set_optimal_resolution();
init();
+ set_optimal_resolution();
// vesa_draw_string("This is a testing text!");