Removed VGA driver support

4 files changed, 44 insertions, 249 deletions

diff --git a/src/kernel/graphics/graphics.h b/src/kernel/graphics/graphics.h
deleted file mode 100644
index baa054a..0000000
--- a/src/kernel/graphics/graphics.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef MELVIX_GRAPHICS_H
-#define MELVIX_GRAPHICS_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * Linked table of colors and hardware color codes
- */
-enum vga_color;
-
-/**
- * Initialize the terminal color and cursor position
- */
-void terminal_initialize(void);
-
-/**
- * Set the terminal color to a specified hardware color code
- * @see enum vga_color
- * @param color
- */
-void terminal_set_color(uint8_t color);
-
-/**
- * Clear the entire terminal screen
- */
-void terminal_clear();
-
-/**
- * Write a string to the terminal
- * @param data The string that should be written
- */
-void terminal_write_string(const char *data);
-
-/**
- * Write an integer to the terminal
- * @param data The integer that should be written
- */
-void terminal_write_number(int data);
-
-/**
- * Put a new char at the x+1 cursor position and
- * handle according events (e.g. overflow, linebreak)
- * @param c The character (can also be \n or \r)
- */
-void terminal_put_char(char c);
-
-/**
- * Put a new char at the x+1 cursor position,
- * handle according events (e.g. overflow, linebreak) and
- * execute the current command if c is linebreak (\n)
- * @param c The character (can also be \n or \r)
- */
-void terminal_put_keyboard_char(char c);
-
-/**
- * Write a line to the terminal
- * @param data The line (string) that should be written
- */
-void terminal_write_line(const char *data);
-
-#endif
\ No newline at end of file
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index 22228de..98d24e3 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -76,18 +76,13 @@ uint16_t *vbe_get_modes() {
 
     // Get number of modes
     uint16_t *mode_ptr = (uint16_t *) info->video_modes;
-    int number_modes = 1;
+    size_t number_modes = 1;
     for (uint16_t *p = mode_ptr; *p != 0xFFFF; p++) number_modes++;
 
     uint16_t *video_modes = kmalloc(sizeof(uint16_t) * number_modes);
-    for (int i = 0; i < number_modes; i++)
+    for (size_t i = 0; i < number_modes; i++)
         video_modes[i] = mode_ptr[i]; // THIS FAILS
 
-    for (int i = 0; i < 47; i++) {
-        serial_write_hex(video_modes[i]);
-        serial_write("\n");
-    }
-
     return video_modes;
 }
 
@@ -118,17 +113,12 @@ struct vbe_mode_info *vbe_get_mode_info(uint16_t mode) {
 
 void set_optimal_resolution() {
     uint16_t *video_modes = vbe_get_modes();
-    serial_write("\n\n");
-    for (int i = 0; i < 47; i++) {
-        serial_write_hex(video_modes[i]);
-        serial_write("\n");
-    }
 
     uint16_t highest = 0;
 
-    for (uint16_t *mode = video_modes; *mode != 0xFFFF; mode++) {
+    /*for (uint16_t *mode = video_modes; *mode != 0xFFFF; mode++) {
         struct vbe_mode_info *mode_info = vbe_get_mode_info(*mode);
-        serial_write_dec(mode_info->width);
+        // serial_write_dec(mode_info->width);
 
         if ((mode_info->attributes & 0x90) != 0x90 || !mode_info->success ||
             (mode_info->memory_model != 4 && mode_info->memory_model != 6))
@@ -156,11 +146,11 @@ void set_optimal_resolution() {
         }
         kfree(mode_info);
     }
-    kfree(video_modes);
+    kfree(video_modes);*/
 
     if (highest == 0) {
-        struct vbe_mode_info *mode_info = vbe_get_mode_info(0x010e);
-        highest = 0x010e;
+        struct vbe_mode_info *mode_info = vbe_get_mode_info(0x577);
+        highest = 0x577;
         vbe_width = mode_info->width;
         vbe_height = mode_info->height;
         vbe_pitch = mode_info->pitch;
@@ -224,17 +214,19 @@ void vesa_draw_rectangle(int x1, int y1, int x2, int y2, int color) {
     }
 }
 
-void vesa_draw_char(char ch, int x, int y) {
+void vesa_draw_char(char ch) {
     int mask[8] = {1, 2, 4, 8, 16, 32, 64, 128};
     unsigned char *glyph = font[ch - 32];
 
     for (int cy = 0; cy < 13; cy++) {
         for (int cx = 0; cx < 8; cx++) {
             if (glyph[cy] & mask[cx]) {
-                vesa_set_pixel(x + 8 - cx, y + 13 - cy, terminal_color);
+                vesa_set_pixel(terminal_x + 8 - cx, terminal_y + 13 - cy, terminal_color);
             }
         }
     }
+
+    terminal_x += 10;
 }
 
 void vesa_keyboard_char(char ch) {
@@ -251,8 +243,7 @@ void vesa_keyboard_char(char ch) {
         terminal_x = 0;
         // terminal_scroll();
     } else if (ch >= ' ') {
-        vesa_draw_char(ch, terminal_x, terminal_y);
-        terminal_x += 10;
+        vesa_draw_char(ch);
     }
 
     // Add new line on overflow
@@ -269,10 +260,27 @@ void vesa_draw_string(char *data) {
     vesa_clear();
     int i = 0;
     while (data[i] != '\0') {
-        vesa_draw_char(data[i], terminal_x, terminal_y);
-        terminal_x += 10;
+        vesa_draw_char(data[i]);
+        i++;
+    }
+}
+
+void vesa_draw_number(int n) {
+    if (n == 0) vesa_draw_char('0');
+    int acc = n;
+    char c[32];
+    int i = 0;
+    while (acc > 0) {
+        c[i] = '0' + acc % 10;
+        acc /= 10;
         i++;
     }
+    c[i] = 0;
+    static char c2[32];
+    c2[i--] = 0;
+    int j = 0;
+    while (i >= 0) c2[i--] = c[j++];
+    vesa_draw_string(c2);
 }
 
 void vesa_set_color(uint32_t color) {
diff --git a/src/kernel/graphics/vesa.h b/src/kernel/graphics/vesa.h
index 9ebc435..4203cf3 100644
--- a/src/kernel/graphics/vesa.h
+++ b/src/kernel/graphics/vesa.h
@@ -134,18 +134,29 @@ void vbe_set_mode(unsigned short mode);
 void set_optimal_resolution();
 
 /**
+ * Clears the screen with black
+ */
+void vesa_clear();
+
+/**
  * Draw a char from keyboard
- * @param ch
+ * @param ch The character
  */
 void vesa_keyboard_char(char ch);
 
 /**
  * Draw a string in VESA mode
- * @param ch
+ * @param data The string
  */
 void vesa_draw_string(char *data);
 
 /**
+ * Draw a number in VESA mode
+ * @param n The number
+ */
+void vesa_draw_number(int n);
+
+/**
  * The current video mode
  */
 int vbe_current_mode;
diff --git a/src/kernel/graphics/vga.c b/src/kernel/graphics/vga.c
deleted file mode 100644
index a470af8..0000000
--- a/src/kernel/graphics/vga.c
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <stddef.h>
-#include <stdint.h>
-#include "../io/io.h"
-#include "../lib/lib.h"
-#include "../commands/command.h"
-#include "../interrupts/interrupts.h"
-
-// Hardware text mode color constants
-enum vga_color {
-    VGA_COLOR_BLACK = 0,
-    VGA_COLOR_BLUE = 1,
-    VGA_COLOR_GREEN = 2,
-    VGA_COLOR_CYAN = 3,
-    VGA_COLOR_RED = 4,
-    VGA_COLOR_MAGENTA = 5,
-    VGA_COLOR_BROWN = 6,
-    VGA_COLOR_LIGHT_GREY = 7,
-    VGA_COLOR_DARK_GREY = 8,
-    VGA_COLOR_LIGHT_BLUE = 9,
-    VGA_COLOR_LIGHT_GREEN = 10,
-    VGA_COLOR_LIGHT_CYAN = 11,
-    VGA_COLOR_LIGHT_RED = 12,
-    VGA_COLOR_LIGHT_MAGENTA = 13,
-    VGA_COLOR_LIGHT_BROWN = 14,
-    VGA_COLOR_WHITE = 15,
-};
-
-inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg) {
-    return fg | bg << 4;
-}
-
-inline uint16_t vga_entry(unsigned char uc, uint8_t color) {
-    return (uint16_t) uc | (uint16_t) color << 8;
-}
-
-static const size_t VGA_WIDTH = 80;
-static const size_t VGA_HEIGHT = 25;
-
-size_t terminal_row;
-size_t terminal_column;
-uint8_t terminal_color;
-uint16_t *terminal_buffer;
-
-char text[1024] = {0};
-
-void terminal_clear() {
-    terminal_row = 0;
-    terminal_column = 0;
-    for (size_t y = 0; y < VGA_HEIGHT; y++) {
-        for (size_t x = 0; x < VGA_WIDTH; x++) {
-            const size_t index = y * VGA_WIDTH + x;
-            terminal_buffer[index] = vga_entry(' ', terminal_color);
-        }
-    }
-}
-
-void terminal_enable_cursor(uint8_t cursor_start, uint8_t cursor_end) {
-    send_b(0x3D4, 0x0A);
-    send_b(0x3D5, (receive_b(0x3D5) & 0xC0) | cursor_start);
-    send_b(0x3D4, 0x0B);
-    send_b(0x3D5, (receive_b(0x3D5) & 0xE0) | cursor_end);
-}
-
-void terminal_update_cursor(void) {
-    unsigned temp = terminal_row * VGA_WIDTH + terminal_column;
-    send_b(0x3D4, 14);
-    send_b(0x3D5, temp >> 8);
-    send_b(0x3D4, 15);
-    send_b(0x3D5, temp);
-}
-
-void terminal_initialize(void) {
-    // terminal_enable_cursor(0, 15);
-    terminal_row = 0;
-    terminal_column = 0;
-    terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
-    terminal_buffer = (uint16_t *) 0xB8000;
-    terminal_clear();
-}
-
-void terminal_scroll(void) {
-    if (terminal_row >= VGA_HEIGHT) {
-        terminal_row = VGA_HEIGHT - 1;
-        for (size_t x = 0; x < VGA_WIDTH; x++)
-            for (size_t y = 0; y < VGA_HEIGHT; y++) {
-                uint16_t c = terminal_buffer[y * VGA_WIDTH + x];
-                terminal_buffer[(y - 1) * VGA_WIDTH + x] = c;
-                terminal_buffer[y * VGA_WIDTH + x] = vga_entry(' ', terminal_color);
-            }
-    }
-}
-
-void terminal_set_color(uint8_t color) {
-    terminal_color = color;
-}
-
-void terminal_put_entry_at(char c, uint8_t color, size_t x, size_t y) {
-    // const size_t index = y * VGA_WIDTH + x;
-    // terminal_buffer[index] = vga_entry(c, color);
-}
-
-void terminal_put_char(char c) {
-    if (c == 0x08) {
-        if (terminal_column != 0) terminal_column--;
-    } else if (c == 0x09) {
-        terminal_column = (terminal_column + 8) & ~(8 - 1);
-    } else if (c == '\r') {
-        terminal_column = 0;
-    } else if (c == '\n') {
-        terminal_row++;
-        terminal_column = 0;
-        // terminal_scroll();
-    } else if (c >= ' ') { // Any printable character
-        // terminal_put_entry_at(c, terminal_color, terminal_column, terminal_row);
-        terminal_column++;
-    }
-
-    // Add new line on overflow
-    if (terminal_column >= VGA_WIDTH) {
-        terminal_column = 0;
-        terminal_row++;
-    }
-
-    // terminal_scroll();
-    // terminal_update_cursor();
-}
-
-void terminal_write(const char *data, size_t size) {
-    for (size_t i = 0; i < size; i++)
-        terminal_put_char(data[i]);
-}
-
-void terminal_put_keyboard_char(char c) {
-    terminal_put_char(c);
-    if (c == '\n' && irq_is_installed(1)) {
-        // exec_command(text);
-        // memory_set(text, 0, sizeof(text));
-        terminal_column = 0;
-        terminal_row++;
-        // terminal_scroll();
-        terminal_put_entry_at('$', terminal_color, terminal_column, terminal_row);
-        terminal_column = 2;
-        // terminal_update_cursor();
-    } else if (c >= ' ' && irq_is_installed(1)) strcat(text, &c);
-}
-
-void terminal_write_string(const char *data) {
-    // terminal_write(data, strlen(data));
-    serial_write(data);
-}
-
-void terminal_write_number(int data) {
-    serial_write_dec(data);
-    // terminal_write(converted, strlen(converted));
-}
-
-void terminal_write_line(const char *data) {
-    serial_write(data);
-    terminal_column = 0;
-    // terminal_write_string(data);
-    terminal_column = 0;
-}