aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2019-09-25 22:57:33 +0200
committerMarvin Borner2019-09-25 22:57:33 +0200
commit8ebf584bbb43584b671b79d5166e00268a7c9661 (patch)
tree466abea4e6da201e7b432d7394e1bf21cbbe1d98 /src/kernel/kernel.c
parent16b8a48d1de16a5982cf983a282832fd4ed01f85 (diff)
Fixed several TTY bugs and improved VESA detection
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 26eee7c..dd68536 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -5,22 +5,23 @@
#include "input/input.h"
#include "timer/timer.h"
-void kernel_main(void) {
+void init() {
asm volatile ("sti");
gdt_install();
idt_install();
isrs_install();
irq_install();
timer_install();
-
- // vbe_set_mode(0x11B); // 1280x1024
-
terminal_initialize();
- terminal_write_string("Melvix loaded successfully!\n");
-
- set_optimal_resolution();
keyboard_install();
// mouse_install();
+}
+
+void kernel_main(void) {
+ // vbe_set_mode(0x11B);
+ set_optimal_resolution();
+
+ terminal_write_string("Melvix loaded successfully!\n");
// __asm__ ("div %0" :: "r"(0)); // Exception testing x/0
} \ No newline at end of file