diff options
author | Marvin Borner | 2019-09-16 19:48:05 +0200 |
---|---|---|
committer | Marvin Borner | 2019-09-16 19:48:05 +0200 |
commit | 397c44c212cabe6d974925ef1752f5eec49f5f44 (patch) | |
tree | bf9fa7f28629f8e693d2e687f9752df0572d34d2 /src | |
parent | f1e62229ca1ce4d7768268724204772049341282 (diff) |
Renamed graphics driver for future VESA? support
Diffstat (limited to 'src')
-rw-r--r-- | src/graphics/vga.h | 19 | ||||
-rw-r--r-- | src/input/ps2/keyboard.c | 2 | ||||
-rw-r--r-- | src/input/ps2/mouse.c | 1 | ||||
-rw-r--r-- | src/interrupts/irq.c | 2 | ||||
-rw-r--r-- | src/interrupts/isr.c | 2 | ||||
-rw-r--r-- | src/memory/memory.c | 2 |
6 files changed, 4 insertions, 24 deletions
diff --git a/src/graphics/vga.h b/src/graphics/vga.h deleted file mode 100644 index 7c449f1..0000000 --- a/src/graphics/vga.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef MELVIX_VGA_H -#define MELVIX_VGA_H - -#include <stddef.h> -#include <stdint.h> - -enum vga_color; - -void terminal_initialize(void); - -void terminal_set_color(uint8_t color); - -void terminal_clear(); - -void terminal_write_string(const char *data); - -void terminal_put_char(char c); - -#endif
\ No newline at end of file diff --git a/src/input/ps2/keyboard.c b/src/input/ps2/keyboard.c index bd8a4ba..ae17675 100644 --- a/src/input/ps2/keyboard.c +++ b/src/input/ps2/keyboard.c @@ -1,6 +1,6 @@ #include "../../interrupts/interrupts.h" #include "../../io/io.h" -#include "../../graphics/vga.h" +#include "../../graphics/graphics.h" unsigned char keymap[128] = { 0 /*E*/, 27, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b', diff --git a/src/input/ps2/mouse.c b/src/input/ps2/mouse.c index 1819b05..49c5a6c 100644 --- a/src/input/ps2/mouse.c +++ b/src/input/ps2/mouse.c @@ -1,6 +1,5 @@ #include "../../io/io.h" #include "../../interrupts/interrupts.h" -#include "../../graphics/vga.h" char mouse_cycle = 0; signed char mouse_byte[3], mouse_ex[3]; diff --git a/src/interrupts/irq.c b/src/interrupts/irq.c index 9b8d89f..70f1eff 100644 --- a/src/interrupts/irq.c +++ b/src/interrupts/irq.c @@ -1,6 +1,6 @@ #include "../io/io.h" #include "interrupts.h" -#include "../graphics/vga.h" +#include "../graphics/graphics.h" extern void irq0(); diff --git a/src/interrupts/isr.c b/src/interrupts/isr.c index a91838f..8da7919 100644 --- a/src/interrupts/isr.c +++ b/src/interrupts/isr.c @@ -1,4 +1,4 @@ -#include "../graphics/vga.h" +#include "../graphics/graphics.h" #include "interrupts.h" // Defined in isr.asm diff --git a/src/memory/memory.c b/src/memory/memory.c index f36c0bc..b978bcf 100644 --- a/src/memory/memory.c +++ b/src/memory/memory.c @@ -1,4 +1,4 @@ -#include "../graphics/vga.h" +#include "../graphics/graphics.h" void *memory_copy(void *dest, const void *src, size_t count) { const char *sp = (const char *) src; |