From 1d3ff04f2dd47c71aa0b2d7e7601f0d31b3eab60 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 26 Sep 2019 22:58:06 +0200
Subject: Added higher half kernel with paging

---
 src/kernel/kernel.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/kernel/kernel.c')

diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index dd68536..383966d 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -6,11 +6,11 @@
 #include "timer/timer.h"
 
 void init() {
-    asm volatile ("sti");
     gdt_install();
     idt_install();
     isrs_install();
     irq_install();
+    asm volatile ("sti");
     timer_install();
     terminal_initialize();
     keyboard_install();
@@ -19,9 +19,12 @@ void init() {
 
 void kernel_main(void) {
     // vbe_set_mode(0x11B);
-    set_optimal_resolution();
+    // set_optimal_resolution();
+    init();
+    keyboard_install();
 
     terminal_write_string("Melvix loaded successfully!\n");
 
     // __asm__  ("div %0" :: "r"(0)); // Exception testing x/0
+    for (;;);
 }
\ No newline at end of file
-- 
cgit v1.2.3