Fixed userspace entering...

Many other fixes too, but I won't mention them because I don't want to
:)

3 files changed, 12 insertions, 14 deletions

diff --git a/src/userspace/libc/syscall.c b/src/userspace/libc/syscall.c
index c147703..fd27ef5 100644
--- a/src/userspace/libc/syscall.c
+++ b/src/userspace/libc/syscall.c
@@ -5,16 +5,10 @@
  */
 DEFN_SYSCALL0(halt, 0);
 
-DEFN_SYSCALL1(write, 1, const char *);
+DEFN_SYSCALL1(putch, 1, const char *);
 
-DEFN_SYSCALL1(read, 2, const char *);
+DEFN_SYSCALL0(getch, 2);
 
-DEFN_SYSCALL1(writec, 3, char);
+DEFN_SYSCALL1(malloc, 3, uint32_t);
 
-DEFN_SYSCALL0(readc, 4);
-
-DEFN_SYSCALL0(get_pointers, 5);
-
-DEFN_SYSCALL1(alloc, 6, uint32_t);
-
-DEFN_SYSCALL1(free, 7, uint32_t);
+DEFN_SYSCALL1(free, 4, uint32_t);
\ No newline at end of file
diff --git a/src/userspace/libc/syscall.h b/src/userspace/libc/syscall.h
index 7dfd28d..9f5bdb0 100644
--- a/src/userspace/libc/syscall.h
+++ b/src/userspace/libc/syscall.h
@@ -84,4 +84,4 @@ DECL_SYSCALL1(alloc, uint32_t);
 
 DECL_SYSCALL1(free, uint32_t);
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index 3cb2bf9..6dcb206 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -2,9 +2,13 @@
 
 void main()
 {
-	syscall_write("\nHello from Userspace!\n");
+	syscall_putch('\n');
+	syscall_putch('>');
+	syscall_putch(' ');
 
-	syscall_write("> ");
+	while (1) {
+		syscall_putch(syscall_getch());
+	}
 
 	syscall_halt();
-}
+}
\ No newline at end of file