diff options
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r-- | src/kernel/kernel.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 8c0b875..6c19e17 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -3,6 +3,7 @@ #include "gdt/gdt.h" #include "interrupts/interrupts.h" #include "input/input.h" +#include "io/io.h" #include "timer/timer.h" #include "paging/paging.h" #include "paging/kheap.h" @@ -13,9 +14,10 @@ void init() { idt_install(); isrs_install(); irq_install(); + init_serial(); // terminal_initialize(); // TODO: Replace VGA functions with VESA - init_kheap(); - page_init(); + // init_kheap(); + // page_init(); // keyboard_install(); // mouse_install(); asm volatile ("sti"); @@ -24,17 +26,19 @@ void init() { void kernel_main(void) { set_optimal_resolution(); init(); - // info("Melvix loaded successfully!"); + // info("Melvix loaded successfully!\n\n"); // info("Loading VESA..."); - /* if (vesa_available) { - info("Loaded VESA!"); + vesa_draw_string("test"); + + if (vesa_available) { + write_serial("Loaded VESA!"); } else { - warn("VESA loading failed!"); - } */ + write_serial("VESA loading failed!"); + } // __asm__ ("div %0" :: "r"(0)); // Exception testing x/0 loop: asm volatile ("hlt"); goto loop; -}
\ No newline at end of file +} |