From 8bb8ed3f9e7d5edb4457a7fade7dbe215bd421d2 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 14 Sep 2019 20:17:46 +0200 Subject: Abstracted VGA driver --- build.sh | 13 ++++++-- src/graphics/vga.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/graphics/vga.h | 15 +++++++++ src/kernel.c | 92 +----------------------------------------------------- 4 files changed, 117 insertions(+), 93 deletions(-) create mode 100644 src/graphics/vga.c create mode 100644 src/graphics/vga.h diff --git a/build.sh b/build.sh index e0c6270..d41c54f 100755 --- a/build.sh +++ b/build.sh @@ -10,8 +10,17 @@ mkdir ./build/ # Make source files i686-elf-as ./src/boot.s -o ./build/boot.o -i686-elf-gcc -c ./src/kernel.c -o ./build/kernel.o -std=gnu99 -ffreestanding -O2 -Wall -Wextra -i686-elf-gcc -T ./src/linker.ld -o ./build/melvix.bin -ffreestanding -O2 -nostdlib ./build/boot.o ./build/kernel.o -lgcc + +files="" +for line in $(find ./src -name \*.c); do + stripped=$(echo "${line}" | sed -r 's/\//_/g') + stripped=${stripped#??????} + stripped=${stripped%%?}o + i686-elf-gcc -c ./"${line}" -o ./build/"${stripped}" -std=gnu99 -ffreestanding -O2 -Wall -Wextra + files="${files} ./build/${stripped}" +done + +i686-elf-gcc -T ./src/linker.ld -o ./build/melvix.bin -ffreestanding -O2 -nostdlib ./build/boot.o $files -lgcc # Testing if grub-file --is-x86-multiboot ./build/melvix.bin; then diff --git a/src/graphics/vga.c b/src/graphics/vga.c new file mode 100644 index 0000000..54527e1 --- /dev/null +++ b/src/graphics/vga.c @@ -0,0 +1,90 @@ +#include +#include + +// 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, +}; + +static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg) { + return fg | bg << 4; +} + +static inline uint16_t vga_entry(unsigned char uc, uint8_t color) { + return (uint16_t) uc | (uint16_t) color << 8; +} + +size_t strlen(const char *str) { + size_t len = 0; + while (str[len]) + len++; + return len; +} + +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; + +void terminal_initialize(void) { + terminal_row = 0; + terminal_column = 0; + terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK); + terminal_buffer = (uint16_t *) 0xB8000; + 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_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 == '\n' || c == '\r') { + terminal_row += 1; + terminal_column = 0; + } else { + terminal_put_entry_at(c, terminal_color, terminal_column, terminal_row); + if (++terminal_column == VGA_WIDTH) { + terminal_column = 0; + if (++terminal_row == VGA_HEIGHT) + terminal_row = 0; + } + } +} + +void terminal_write(const char *data, size_t size) { + for (size_t i = 0; i < size; i++) + terminal_put_char(data[i]); +} + +void terminal_write_string(const char *data) { + terminal_write(data, strlen(data)); +} \ No newline at end of file diff --git a/src/graphics/vga.h b/src/graphics/vga.h new file mode 100644 index 0000000..7c96c08 --- /dev/null +++ b/src/graphics/vga.h @@ -0,0 +1,15 @@ +#ifndef MELVIX_VGA_H +#define MELVIX_VGA_H + +#include +#include + +enum vga_color; + +void terminal_initialize(void); + +void terminal_set_color(uint8_t color); + +void terminal_write_string(const char *data); + +#endif \ No newline at end of file diff --git a/src/kernel.c b/src/kernel.c index 947d6b9..e8ee10e 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -1,94 +1,4 @@ -#include -#include -#include - -// 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, -}; - -static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg) { - return fg | bg << 4; -} - -static inline uint16_t vga_entry(unsigned char uc, uint8_t color) { - return (uint16_t) uc | (uint16_t) color << 8; -} - -size_t strlen(const char *str) { - size_t len = 0; - while (str[len]) - len++; - return len; -} - -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; - -void terminal_initialize(void) { - terminal_row = 0; - terminal_column = 0; - terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK); - terminal_buffer = (uint16_t *) 0xB8000; - 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_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 == '\n' || c == '\r') { - terminal_row += 1; - terminal_column = 0; - } else { - terminal_put_entry_at(c, terminal_color, terminal_column, terminal_row); - if (++terminal_column == VGA_WIDTH) { - terminal_column = 0; - if (++terminal_row == VGA_HEIGHT) - terminal_row = 0; - } - } -} - -void terminal_write(const char *data, size_t size) { - for (size_t i = 0; i < size; i++) - terminal_put_char(data[i]); -} - -void terminal_write_string(const char *data) { - terminal_write(data, strlen(data)); -} +#include "graphics/vga.h" void kernel_main(void) { terminal_initialize(); -- cgit v1.2.3