MUCH work in libc

Also cleaned up some syscalls etc

5 files changed, 146 insertions, 0 deletions

diff --git a/src/userspace/libc/stdio/getch.c b/src/userspace/libc/stdio/getch.c
new file mode 100644
index 0000000..93d3d00
--- /dev/null
+++ b/src/userspace/libc/stdio/getch.c
@@ -0,0 +1,74 @@
+#include <stdint.h>
+#include <syscall.h>
+
+// 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
+	u8 scancode = 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
new file mode 100644
index 0000000..3951250
--- /dev/null
+++ b/src/userspace/libc/stdio/printf.c
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdio.h>
+
+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
new file mode 100644
index 0000000..3bc5a2e
--- /dev/null
+++ b/src/userspace/libc/stdio/putch.c
@@ -0,0 +1,7 @@
+#include <syscall.h>
+
+void putch(char ch)
+{
+	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
new file mode 100644
index 0000000..a4fd3ea
--- /dev/null
+++ b/src/userspace/libc/stdio/puts.c
@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+void puts(char *data)
+{
+	for (u8 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
new file mode 100644
index 0000000..dc5ed23
--- /dev/null
+++ b/src/userspace/libc/stdio/vprintf.c
@@ -0,0 +1,46 @@
+#include <stdint.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+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