diff options
author | Marvin Borner | 2019-10-02 20:01:17 +0200 |
---|---|---|
committer | Marvin Borner | 2019-10-02 20:01:17 +0200 |
commit | 3238ced93283a167675f20244ec9fd6310eb8002 (patch) | |
tree | 288078ca30e9e4b5d5ba9a178315cb5ee9f6a2d8 /src/kernel/kernel.c | |
parent | 682c47a98844ffec3f3129160e9cdb98ba129989 (diff) |
Finally fixed VESA auto resolution finder
This was quite hard and strange but it works now!
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r-- | src/kernel/kernel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 013f7d5..6b1faf7 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -12,21 +12,21 @@ void init() { idt_install(); isrs_install(); irq_install(); - init_kheap(); - page_init(); timer_install(); - // terminal_initialize(); + terminal_initialize(); + // init_kheap(); + // page_init(); keyboard_install(); // mouse_install(); asm volatile ("sti"); } void kernel_main(void) { - // vbe_set_mode(0x11B); set_optimal_resolution(); + // vbe_set_mode(0x11B); init(); - - // terminal_write_string("Melvix loaded successfully!\n"); + terminal_write_string("Melvix loaded successfully!\n"); + terminal_write_string("Loading VESA!\n"); // __asm__ ("div %0" :: "r"(0)); // Exception testing x/0 for (;;); |