6 files changed, 24 insertions, 17 deletions

diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index 9ea83aa..120ff15 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -1,19 +1,16 @@
 #include "vesa.h"
-#include "graphics.h"
-#include "../input/input.h"
 #include "../system.h"
 #include "../lib/lib.h"
 
 void switch_to_vga() {
+    vesa_available = 0;
     regs16_t regs;
     regs.ax = 0x0003;
     int32(0x10, &regs);
-    init();
-    terminal_write_line("FAILED!");
-    keyboard_install();
 }
 
 struct vbe_mode_info *vbe_set_mode(unsigned short mode) {
+    vesa_available = 0;
     regs16_t regs;
     regs.ax = 0x4F02;
     regs.bx = mode | (1 << 14);
@@ -47,6 +44,8 @@ struct vbe_mode_info *vbe_set_mode(unsigned short mode) {
         regs.ax = 0x0003;
         int32(0x10, &regs);
 
+        vesa_available = 1;
+
         return vbe_info;
     } else {
         switch_to_vga();
@@ -57,6 +56,7 @@ struct vbe_mode_info *vbe_set_mode(unsigned short mode) {
 }
 
 void set_optimal_resolution() {
+    vesa_available = 0;
     struct vbe_info *info = (struct vbe_info *) 0x2000;
     struct vbe_mode_info *mode_info = (struct vbe_mode_info *) 0x3000;
 
diff --git a/src/kernel/graphics/vesa.h b/src/kernel/graphics/vesa.h
index eff74ea..83c6ad2 100644
--- a/src/kernel/graphics/vesa.h
+++ b/src/kernel/graphics/vesa.h
@@ -4,6 +4,8 @@
 #include <stdint.h>
 #include "../system.h"
 
+int vesa_available;
+
 /**
  * The CPUs response to the 0x4F00 call
  * Used to receive the supported video modes
diff --git a/src/kernel/input/ps2/keyboard.c b/src/kernel/input/ps2/keyboard.c
index 100c0d8..262178d 100644
--- a/src/kernel/input/ps2/keyboard.c
+++ b/src/kernel/input/ps2/keyboard.c
@@ -52,7 +52,7 @@ void keyboard_rate() {
     send_b(0x60, 0x0); // Rate{00000} Delay{00} 0
 }
 
-/* Installs the keyboard handler into IRQ1 */
+// Installs the keyboard handler into IRQ1
 void keyboard_install() {
     keyboard_rate();
     irq_install_handler(1, keyboard_handler);
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 6b1faf7..f6ec4df 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -8,14 +8,14 @@
 #include "paging/kheap.h"
 
 void init() {
+    timer_install();
     gdt_install();
     idt_install();
     isrs_install();
     irq_install();
-    timer_install();
-    terminal_initialize();
-    // init_kheap();
-    // page_init();
+    // terminal_initialize(); // TODO: Re[ace VGA functions with VESA
+    init_kheap();
+    page_init();
     keyboard_install();
     // mouse_install();
     asm volatile ("sti");
@@ -23,10 +23,15 @@ void init() {
 
 void kernel_main(void) {
     set_optimal_resolution();
-    // vbe_set_mode(0x11B);
     init();
-    terminal_write_string("Melvix loaded successfully!\n");
-    terminal_write_string("Loading VESA!\n");
+    info("Melvix loaded successfully!");
+    info("Loading VESA...");
+
+    if (vesa_available) {
+        info("Loaded VESA!");
+    } else {
+        warn("VESA loading failed!");
+    }
 
     // __asm__  ("div %0" :: "r"(0)); // Exception testing x/0
     for (;;);
diff --git a/src/kernel/system.h b/src/kernel/system.h
index 57db4c9..3f5b595 100644
--- a/src/kernel/system.h
+++ b/src/kernel/system.h
@@ -87,11 +87,11 @@ static inline void kernel_time() {
  * @param msg The information
  */
 static inline void info(char *msg) {
-    terminal_set_color(10);
+    terminal_set_color(9);
     kernel_time();
     terminal_write_string("INFO: ");
     terminal_write_string(msg);
-    terminal_write_string("\n");
+    terminal_write_string("\r");
     terminal_set_color(7);
 }
 
@@ -105,7 +105,7 @@ static inline void warn(char *msg) {
     kernel_time();
     terminal_write_string("WARNING: ");
     terminal_write_string(msg);
-    terminal_write_string("\n");
+    terminal_write_string("\r");
     terminal_set_color(7);
 }
 
diff --git a/src/kernel/timer/timer.h b/src/kernel/timer/timer.h
index 309896a..30256d9 100644
--- a/src/kernel/timer/timer.h
+++ b/src/kernel/timer/timer.h
@@ -14,7 +14,7 @@ void timer_wait(int ticks);
 
 /**
  * Get the current timer ticks
- * @return The current timer ticks (100 ticks = 1 second)
+ * @return The current timer ticks (1000 ticks = 1 second)
  */
 unsigned int get_time();