diff options
author | Marvin Borner | 2019-09-25 19:33:29 +0200 |
---|---|---|
committer | Marvin Borner | 2019-09-25 19:33:29 +0200 |
commit | 16b8a48d1de16a5982cf983a282832fd4ed01f85 (patch) | |
tree | 1a0294b9f96fe8ffc788ce7ef600c9ff8eb4f856 /src/kernel/kernel.c | |
parent | 64ec44ba4575686849ba2597cf8bc9054af3d376 (diff) |
Started integrating vesa resolution finder
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r-- | src/kernel/kernel.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index d0356f4..26eee7c 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -1,3 +1,4 @@ +#include "graphics/vesa.h" #include "graphics/graphics.h" #include "gdt/gdt.h" #include "interrupts/interrupts.h" @@ -10,14 +11,16 @@ void kernel_main(void) { idt_install(); isrs_install(); irq_install(); + timer_install(); - vbe_set_mode(0x11B); // 1280x1024 + // vbe_set_mode(0x11B); // 1280x1024 - // terminal_initialize(); - // terminal_write_string("Melvix loaded successfully!\n"); + terminal_initialize(); + terminal_write_string("Melvix loaded successfully!\n"); - timer_install(); + set_optimal_resolution(); keyboard_install(); // mouse_install(); + // __asm__ ("div %0" :: "r"(0)); // Exception testing x/0 }
\ No newline at end of file |