Finally fixed text input syscalls!

I guess I can officially call me dumb now as I just forgot
to return the actual value from the syscall handler...

5 files changed, 15 insertions, 16 deletions

diff --git a/src/userspace/main.c b/src/userspace/main.c
index 9341bd0..0bea7fa 100644
--- a/src/userspace/main.c
+++ b/src/userspace/main.c
@@ -1,18 +1,16 @@
 #include <syscall.h>
 #include <graphics/graphics.h>
+#include <mlibc/stdio.h>
 
 void user_main()
 {
     char hello[] = "> Successfully switched to usermode!\n";
     syscall_write(hello);
 
-    init_framebuffer();
+    // init_framebuffer();
 
-    while (1) {};
-
-    /*while (1) {
-        char *key = malloc(1);
-        syscall_readc(key);
-        syscall_writec(key);
-    };*/
+    while (1) {
+        char key = getch();
+        writec(key);
+    };
 }
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdio/getch.c b/src/userspace/mlibc/stdio/getch.c
index 114b6e0..dc9c40e 100644
--- a/src/userspace/mlibc/stdio/getch.c
+++ b/src/userspace/mlibc/stdio/getch.c
@@ -1,7 +1,6 @@
-// #include <syscall.h>
+#include <syscall.h>
 
 char getch()
 {
-    // return ((char *) syscall_read())[0];
-    return 0;
+    return (char) syscall_readc();
 }
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdio/writec.c b/src/userspace/mlibc/stdio/writec.c
index 9ffb1a1..ee588e5 100644
--- a/src/userspace/mlibc/stdio/writec.c
+++ b/src/userspace/mlibc/stdio/writec.c
@@ -1,4 +1,6 @@
+#include <syscall.h>
+
 void writec(char c)
 {
-    //
+    syscall_writec(c);
 }
\ No newline at end of file
diff --git a/src/userspace/syscall.c b/src/userspace/syscall.c
index b398728..35e6d50 100644
--- a/src/userspace/syscall.c
+++ b/src/userspace/syscall.c
@@ -9,9 +9,9 @@ DEFN_SYSCALL1(write, 1, char *);
 
 DEFN_SYSCALL1(read, 2, char *);
 
-DEFN_SYSCALL1(writec, 3, char *);
+DEFN_SYSCALL1(writec, 3, char);
 
-DEFN_SYSCALL1(readc, 4, char *);
+DEFN_SYSCALL0(readc, 4);
 
 DEFN_SYSCALL0(get_pointers, 5);
 
diff --git a/src/userspace/syscall.h b/src/userspace/syscall.h
index c46bb54..8dd647f 100644
--- a/src/userspace/syscall.h
+++ b/src/userspace/syscall.h
@@ -70,9 +70,9 @@ DECL_SYSCALL1(write, char *);
 
 DECL_SYSCALL1(read, char *);
 
-DECL_SYSCALL1(writec, char *);
+DECL_SYSCALL1(writec, char);
 
-DECL_SYSCALL1(readc, char *);
+DECL_SYSCALL0(readc);
 
 DECL_SYSCALL0(get_pointers);