aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2019-09-26 22:58:06 +0200
committerMarvin Borner2019-09-26 22:58:06 +0200
commit1d3ff04f2dd47c71aa0b2d7e7601f0d31b3eab60 (patch)
tree84b51246358d8c93f50ac677c598d9da98fd56eb /src/kernel/kernel.c
parent181947c70d7a6c5ff769243885d76f3af39560ce (diff)
Added higher half kernel with paging
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c7
1 files changed, 5 insertions, 2 deletions
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