Reorganise files

1 files changed, 84 insertions, 83 deletions

diff --git a/kernel/kernel.c b/kernel/kernel.c
index fbef9d4..80f110d 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,96 +1,97 @@
-#include "./io/vga/text_mode_display.h"
-#include "./io/vga/colours.h"
+#include "./gpu/text_mode/display.h"
+#include "./gpu/text_mode/colours.h"
 #include "./io/keyboard/keyboard_handler.h"
 #include "global_descriptor_table.h"
 
 void run_kern_demo()
 {
-  vga_set_text_colour(COLOUR_LIGHT_GREEN, COLOUR_BLACK);
-  vga_clear_screen();
+  scrn_set_text_colour(COLOUR_LIGHT_GREEN, COLOUR_BLACK);
+  scrn_clear();
 
-  vga_print_ln("  _   _              ____   _____ ");
-  vga_print_ln(" | | (_)            / __ \\ / ____|");
-  vga_print_ln(" | |_ _ _ __  _   _| |  | | (___  ");
-  vga_print_ln(" | __| | '_ \\| | | | |  | |\\___ \\ ");
-  vga_print_ln(" | |_| | | | | |_| | |__| |____) |");
-  vga_print_ln("  \\__|_|_| |_|\\__, |\\____/|_____/ ");
-  vga_print_ln("               __/ |              ");
-  vga_print_ln("              |___/               ");
+  scrn_println("  _   _              ____   _____ ");
+  scrn_println(" | | (_)            / __ \\ / ____|");
+  scrn_println(" | |_ _ _ __  _   _| |  | | (___  ");
+  scrn_println(" | __| | '_ \\| | | | |  | |\\___ \\ ");
+  scrn_println(" | |_| | | | | |_| | |__| |____) |");
+  scrn_println("  \\__|_|_| |_|\\__, |\\____/|_____/ ");
+  scrn_println("               __/ |              ");
+  scrn_println("              |___/               ");
 
-  vga_print_ln("");
-  vga_print_ln("Supported colours");
-  vga_set_text_colour(COLOUR_BLUE, COLOUR_BLACK);
-  vga_print("blue ");
-  vga_set_text_colour(COLOUR_GREEN, COLOUR_BLACK);
-  vga_print("green ");
-  vga_set_text_colour(COLOUR_CYAN, COLOUR_BLACK);
-  vga_print("cyan ");
-  vga_set_text_colour(COLOUR_RED, COLOUR_BLACK);
-  vga_print("red ");
-  vga_set_text_colour(COLOUR_PURPLE, COLOUR_BLACK);
-  vga_print("purple ");
-  vga_set_text_colour(COLOUR_BROWN, COLOUR_BLACK);
-  vga_print("brown ");
-  vga_set_text_colour(COLOUR_GRAY, COLOUR_BLACK);
-  vga_print_ln("gray ");
-  vga_set_text_colour(COLOUR_DARK_GREY, COLOUR_BLACK);
-  vga_print("dark gray ");
-  vga_set_text_colour(COLOUR_LIGHT_BLUE, COLOUR_BLACK);
-  vga_print("light blue ");
-  vga_set_text_colour(COLOUR_LIGHT_GREEN, COLOUR_BLACK);
-  vga_print("light green ");
-  vga_set_text_colour(COLOUR_LIGHT_CYAN, COLOUR_BLACK);
-  vga_print_ln("light cyan");
-  vga_set_text_colour(COLOUR_LIGHT_RED, COLOUR_BLACK);
-  vga_print("light red ");
-  vga_set_text_colour(COLOUR_LIGHT_PURPLE, COLOUR_BLACK);
-  vga_print("light purple ");
-  vga_set_text_colour(COLOUR_YELLOW, COLOUR_BLACK);
-  vga_print("yellow ");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_BLACK);
-  vga_print_ln("white ");
+  scrn_println("");
+  scrn_println("Supported colours");
+  scrn_set_text_colour(COLOUR_BLUE, COLOUR_BLACK);
+  scrn_print("blue ");
+  scrn_set_text_colour(COLOUR_GREEN, COLOUR_BLACK);
+  scrn_print("green ");
+  scrn_set_text_colour(COLOUR_CYAN, COLOUR_BLACK);
+  scrn_print("cyan ");
+  scrn_set_text_colour(COLOUR_RED, COLOUR_BLACK);
+  scrn_print("red ");
+  scrn_set_text_colour(COLOUR_PURPLE, COLOUR_BLACK);
+  scrn_print("purple ");
+  scrn_set_text_colour(COLOUR_BROWN, COLOUR_BLACK);
+  scrn_print("brown ");
+  scrn_set_text_colour(COLOUR_GRAY, COLOUR_BLACK);
+  scrn_println("gray ");
+  scrn_set_text_colour(COLOUR_DARK_GREY, COLOUR_BLACK);
+  scrn_print("dark gray ");
+  scrn_set_text_colour(COLOUR_LIGHT_BLUE, COLOUR_BLACK);
+  scrn_print("light blue ");
+  scrn_set_text_colour(COLOUR_LIGHT_GREEN, COLOUR_BLACK);
+  scrn_print("light green ");
+  scrn_set_text_colour(COLOUR_LIGHT_CYAN, COLOUR_BLACK);
+  scrn_println("light cyan");
+  scrn_set_text_colour(COLOUR_LIGHT_RED, COLOUR_BLACK);
+  scrn_print("light red ");
+  scrn_set_text_colour(COLOUR_LIGHT_PURPLE, COLOUR_BLACK);
+  scrn_print("light purple ");
+  scrn_set_text_colour(COLOUR_YELLOW, COLOUR_BLACK);
+  scrn_print("yellow ");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_BLACK);
+  scrn_println("white ");
 
-  vga_set_text_colour(COLOUR_BLACK, COLOUR_WHITE);
-  vga_print("B");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_BLUE);
-  vga_print("A");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_GREEN);
-  vga_print("C");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_CYAN);
-  vga_print("K");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_RED);
-  vga_print("G");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_PURPLE);
-  vga_print("R");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_BROWN);
-  vga_print("O");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_GRAY);
-  vga_print("U");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_LIGHT_BLUE);
-  vga_print("N");
-  vga_set_text_colour(COLOUR_BLACK, COLOUR_YELLOW);
-  vga_print("D");
-  vga_set_text_colour(COLOUR_BLACK, COLOUR_LIGHT_GREEN);
-  vga_print(" ");
+  scrn_set_text_colour(COLOUR_BLACK, COLOUR_WHITE);
+  scrn_print("B");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_BLUE);
+  scrn_print("A");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_GREEN);
+  scrn_print("C");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_CYAN);
+  scrn_print("K");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_RED);
+  scrn_print("G");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_PURPLE);
+  scrn_print("R");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_BROWN);
+  scrn_print("O");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_GRAY);
+  scrn_print("U");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_LIGHT_BLUE);
+  scrn_print("N");
+  scrn_set_text_colour(COLOUR_BLACK, COLOUR_YELLOW);
+  scrn_print("D");
+  scrn_set_text_colour(COLOUR_BLACK, COLOUR_LIGHT_GREEN);
+  scrn_print(" ");
 
-  vga_set_text_colour(COLOUR_BLACK, COLOUR_LIGHT_CYAN);
-  vga_print("C");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_LIGHT_RED);
-  vga_print("O");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_LIGHT_PURPLE);
-  vga_print("L");
-  vga_set_text_colour(COLOUR_BLACK, COLOUR_WHITE);
-  vga_print("O");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_RED);
-  vga_print("U");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_PURPLE);
-  vga_print("R");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_BROWN);
-  vga_print("S");
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_GRAY);
-  vga_print("!");
+  scrn_set_text_colour(COLOUR_BLACK, COLOUR_LIGHT_CYAN);
+  scrn_print("C");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_LIGHT_RED);
+  scrn_print("O");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_LIGHT_PURPLE);
+  scrn_print("L");
+  scrn_set_text_colour(COLOUR_BLACK, COLOUR_WHITE);
+  scrn_print("O");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_RED);
+  scrn_print("U");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_PURPLE);
+  scrn_print("R");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_BROWN);
+  scrn_print("S");
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_GRAY);
+  scrn_print("!");
 
-  vga_set_text_colour(COLOUR_WHITE, COLOUR_BLACK);
+  scrn_set_text_colour(COLOUR_WHITE, COLOUR_BLACK);
+  scrn_newline();
 }