aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c12
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 (;;);