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.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index f6ec4df..8c0b875 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -13,10 +13,10 @@ void init() {
idt_install();
isrs_install();
irq_install();
- // terminal_initialize(); // TODO: Re[ace VGA functions with VESA
+ // terminal_initialize(); // TODO: Replace VGA functions with VESA
init_kheap();
page_init();
- keyboard_install();
+ // keyboard_install();
// mouse_install();
asm volatile ("sti");
}
@@ -24,15 +24,17 @@ void init() {
void kernel_main(void) {
set_optimal_resolution();
init();
- info("Melvix loaded successfully!");
- info("Loading VESA...");
+ // info("Melvix loaded successfully!");
+ // info("Loading VESA...");
- if (vesa_available) {
+ /* if (vesa_available) {
info("Loaded VESA!");
} else {
warn("VESA loading failed!");
- }
+ } */
// __asm__ ("div %0" :: "r"(0)); // Exception testing x/0
- for (;;);
+ loop:
+ asm volatile ("hlt");
+ goto loop;
} \ No newline at end of file