From eed77bd2970a00d1394ed027ceca5b646e4671ce Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 17 Jun 2020 18:31:46 +0200 Subject: Started rewrite --- src/userspace/libc/stdio/getch.c | 75 -------------------------------------- src/userspace/libc/stdio/printf.c | 10 ----- src/userspace/libc/stdio/putch.c | 22 ----------- src/userspace/libc/stdio/puts.c | 9 ----- src/userspace/libc/stdio/vprintf.c | 46 ----------------------- 5 files changed, 162 deletions(-) delete mode 100644 src/userspace/libc/stdio/getch.c delete mode 100644 src/userspace/libc/stdio/printf.c delete mode 100644 src/userspace/libc/stdio/putch.c delete mode 100644 src/userspace/libc/stdio/puts.c delete mode 100644 src/userspace/libc/stdio/vprintf.c (limited to 'src/userspace/libc/stdio') diff --git a/src/userspace/libc/stdio/getch.c b/src/userspace/libc/stdio/getch.c deleted file mode 100644 index 5f9655a..0000000 --- a/src/userspace/libc/stdio/getch.c +++ /dev/null @@ -1,75 +0,0 @@ -#include -#include - -// TODO: Move keymaps somewhere more appropriate -char keymap[128] = { - 0 /*E*/, 27, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', - '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', - '\n', 17 /*C*/, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', - 14 /*LS*/, '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 14 /*RS*/, '*', - 0, // Alt key - ' ', // Space bar - 15, // Caps lock - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys - 0, // Num lock - 0, // Scroll lock - 0, // Home key - 0, // Up arrow - 0, // Page up - '-', - 0, // Left arrow - 0, - 0, // Right arrow - '+', - 0, // End key - 0, // Down arrow - 0, // Page down - 0, // Insert key - 0, // Delete key - 0, 0, 0, - 0, // F11 - 0, // F12 - 0, // Other keys -}; - -char shift_keymap[128] = { - 0 /*E*/, 27, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', - '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', - '\n', 17 /*C*/, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '~', - 14 /*LS*/, '|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 14 /*RS*/, '*', - 0, // Alt key - ' ', // Space bar - 15, // Caps lock - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys - 0, // Num lock - 0, // Scroll lock - 0, // Home key - 0, // Up arrow - 0, // Page up - '-', - 0, // Left arrow - 0, - 0, // Right arrow - '+', - 0, // End key - 0, // Down arrow - 0, // Page down - 0, // Insert key - 0, // Delete key - 0, 0, 0, - 0, // F11 - 0, // F12 - 0, // Other keys -}; - -char *getch() -{ - // TODO: Add shift support - // TODO: Implement keyboard dev driver - u8 scancode = 42; //syscall_scancode(); - if ((scancode & 0x80) == 0) { // Press - return keymap[scancode]; - } else { // Release - return 0; - } -} \ No newline at end of file diff --git a/src/userspace/libc/stdio/printf.c b/src/userspace/libc/stdio/printf.c deleted file mode 100644 index 3951250..0000000 --- a/src/userspace/libc/stdio/printf.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - -void printf(char *fmt, ...) -{ - va_list args; - va_start(args, fmt); - vprintf(fmt, args); - va_end(args); -} \ No newline at end of file diff --git a/src/userspace/libc/stdio/putch.c b/src/userspace/libc/stdio/putch.c deleted file mode 100644 index 2dad6dc..0000000 --- a/src/userspace/libc/stdio/putch.c +++ /dev/null @@ -1,22 +0,0 @@ -#include - -int is_transmit_empty() -{ - u8 value; - asm volatile("inb %1, %0" : "=a"(value) : "Nd"(0x3f8 + 5)); - return value & 0x20; -} - -void putch(char ch) -{ - while (is_transmit_empty() == 0) - ; - asm volatile("outb %0, %1" ::"a"(ch), "Nd"(0x3f8)); -} - -/*void putch(char ch) -{ - // TODO: Implement framebuffer writing - //if (ch != 0) - //syscall_putch(ch); -}*/ \ No newline at end of file diff --git a/src/userspace/libc/stdio/puts.c b/src/userspace/libc/stdio/puts.c deleted file mode 100644 index 979dd0a..0000000 --- a/src/userspace/libc/stdio/puts.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include -#include - -void puts(char *data) -{ - for (u32 i = 0; i < strlen(data); i++) - putch(data[i]); -} \ No newline at end of file diff --git a/src/userspace/libc/stdio/vprintf.c b/src/userspace/libc/stdio/vprintf.c deleted file mode 100644 index 691f153..0000000 --- a/src/userspace/libc/stdio/vprintf.c +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include -#include -#include - -void vprintf(char *fmt, va_list args) -{ - u8 readyToFormat = 0; - - char buff = 0; - - for (; *fmt; fmt++) { - if (readyToFormat) { - if (*fmt == '%') { - putch('%'); - readyToFormat = 0; - continue; - } - - buff = *fmt; - if (buff == 's') { - char *str = va_arg(args, char *); - puts(str); - readyToFormat = 0; - } else if (buff == 'x') { - char *p = htoa((u32)va_arg(args, int)); - puts(p); - free(p); - readyToFormat = 0; - } else if (buff == 'd') { - char *p = itoa(va_arg(args, int)); - puts(p); - free(p); - readyToFormat = 0; - } else if (buff == 'c') { - putch((char)va_arg(args, int)); - readyToFormat = 0; - } - } else { - if (*fmt == '%') - readyToFormat = 1; - else - putch(*fmt); - } - } -} \ No newline at end of file -- cgit v1.2.3