From 247fb5a8476aa66fdc6d4f042b0a743fe7c3ab2b Mon Sep 17 00:00:00 2001 From: aqua Date: Tue, 1 Nov 2022 17:43:33 +0200 Subject: Add uppercase scancodes Make text mode screen scroll --- devices/ps2_keyboard.c | 28 +++++++++++-- devices/vga.c | 112 +++++++++++++++++++++++++++++++++++++++++++++---- devices/vga.h | 7 ++++ 3 files changed, 135 insertions(+), 12 deletions(-) (limited to 'devices') diff --git a/devices/ps2_keyboard.c b/devices/ps2_keyboard.c index 6171d18..e5af423 100644 --- a/devices/ps2_keyboard.c +++ b/devices/ps2_keyboard.c @@ -11,9 +11,16 @@ const uint8_t comm_write_ctrl_config = 0x60; const uint8_t data_port = 0x60; // rw const uint8_t data_enable_scanning = 0xf4; -const char scancodes[] = {'E', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b', 'T', 'q', 'w', 'e', - 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', 'C', 'a', 's', 'd', 'f', 'g', 'h', 'j', - 'k', 'l', ';', '\'', '`', 'L', '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 'R'}; +const char scancodes[2][68] = {{'E', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b', + 'T', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', + 'C', 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 'L', + '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 'R', 'P', 'A', + ' ', 'C', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'}, + {'E', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b', 'T', 'Q', 'W', + 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n', 'C', 'A', 'S', 'D', 'F', 'G', + 'H', 'J', 'K', 'L', ':', '"', '~', 'L', '|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', + '>', '?', 'R', 'P', 'A', ' ', 'C', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'}}; +int shift_case = 0; void ps2_keyboard_init() @@ -32,9 +39,22 @@ void ps2_keyboard_irq_handler() { const uint8_t key = inb(data_port); + + switch (key) { + case 0x2a: // left shift down + case 0x36: // right shift down + shift_case = 1; + return; + + case 0xaa: // left shift up + case 0xb6: // right shift up + shift_case = 0; + return; + } + if (key >= 0x80) return; - if (key < 0x37) printf("%c", scancodes[key - 1]); + if (key < (sizeof(scancodes[0]) / sizeof(const char))) printf("%c", scancodes[shift_case][key - 1]); else printf("key pressed: %x\n", key); } diff --git a/devices/vga.c b/devices/vga.c index 983e630..908bd5e 100644 --- a/devices/vga.c +++ b/devices/vga.c @@ -1,35 +1,131 @@ #include "vga.h" -#include #include +#include struct __attribute__((packed)) VGAEntry { unsigned char text; uint8_t foreground : 4; uint8_t background : 4; }; +_Static_assert(sizeof(struct VGAEntry) == 2, "sizeof VGAEntry"); -_Static_assert(sizeof(struct VGAEntry) == 2); - -const size_t width = 80; -const size_t height = 25; +const int width = 80; +const int height = 25; struct VGAEntry *buffer; +int col = 0; +int row = 0; void vga_init() { buffer = (struct VGAEntry *)0xc03ff000; + // vga_enable_cursor(0, 15); vga_clear(VGA_COLOR_LIGHT_BLUE, VGA_COLOR_LIGHT_GREY); } void vga_clear(enum vga_color foreground, enum vga_color background) { - for (size_t y = 0; y < height; ++y) - for (size_t x = 0; x < width; ++x) { - const size_t index = y * width + x; + for (int y = 0; y < height; ++y) + for (int x = 0; x < width; ++x) { + const int index = y * width + x; buffer[index].text = ' '; buffer[index].foreground = foreground; buffer[index].background = background; } + col = row = 0; + // vga_update_cursor(); +} + +void +vga_putc(char a) +{ + switch (a) { + case '\n': + col = 0; + ++row; + break; + case '\r': + col = 0; + break; + case '\b': + --col; + if (col < 0) col = 0; + break; + default: + buffer[row * width + col].text = a; + ++col; + } + + if (col == width) { + col = 0; + ++row; + } + + if (row == height) { + // scroll up + for (int y = 1; y < height; ++y) + for (int x = 0; x < width; ++x) { + const int prev = (y - 1) * width + x; + const int curr = y * width + x; + buffer[prev] = buffer[curr]; + } + // blank out last row + for (int i = (height - 1) * width; i < height * width; ++i) buffer[i].text = ' '; + --row; + } +} + +void +vga_puts(const char *string, int len) +{ + + if (len == -1) + while (*string != '\0') { + vga_putc(*string); + ++string; + } + + else + for (int i = 0; i < len; ++i) { vga_putc(string[i]); } +} + +// Cursor +const uint16_t cga_idx_port = 0x3d4; +const uint16_t cga_dat_port = 0x3d5; + +const uint8_t cursor_start = 0xa; +const uint8_t cursor_end = 0xb; +const uint8_t cursor_addr_h = 0xe; +const uint8_t cursor_addr_l = 0xf; +const uint8_t cursor_hide = 0x20; + +void +vga_enable_cursor(unsigned char start, unsigned char end) +{ + outb(cga_idx_port, cursor_start); + outb(cga_dat_port, (inb(cga_dat_port) & 0xc0) | start); + + outb(cga_idx_port, cursor_end); + outb(cga_dat_port, (inb(cga_dat_port) & 0xe0) | end); +} + +void +vga_disable_cursor() +{ + outb(cga_idx_port, cursor_start); + outb(cga_dat_port, cursor_hide); +} + +void +vga_update_cursor() +{ + const uint16_t pos = row * width + col; + + outb(cga_idx_port, cursor_addr_l); + outb(cga_dat_port, pos & 0xff); + + outb(cga_idx_port, cursor_addr_h); + outb(cga_dat_port, (pos >> 8) & 0xff); } diff --git a/devices/vga.h b/devices/vga.h index c2ef2ef..63de309 100644 --- a/devices/vga.h +++ b/devices/vga.h @@ -22,3 +22,10 @@ enum vga_color { void vga_init(); void vga_clear(enum vga_color foreground, enum vga_color background); + +void vga_putc(char a); +void vga_puts(const char *string, int len); + +void vga_enable_cursor(unsigned char start, unsigned char end); +void vga_disable_cursor(); +void vga_update_cursor(); -- cgit v1.2.1