Some fixes here and there...

Also implemented serial console in userspace

2 files changed, 25 insertions, 10 deletions

diff --git a/src/userspace/libc/stdio/putch.c b/src/userspace/libc/stdio/putch.c
index f87680e..2dad6dc 100644
--- a/src/userspace/libc/stdio/putch.c
+++ b/src/userspace/libc/stdio/putch.c
@@ -1,8 +1,22 @@
 #include <syscall.h>
 
+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
+}*/
\ No newline at end of file
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index 5ff1864..68d025c 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -5,17 +5,18 @@
 #include <unistd.h>
 #include <gui.h>
 
-void test(u8 *data)
-{
-	syscall_halt();
-}
-
 void main()
 {
-	/* gui_init(); */
-	/* gui_screen_clear(); */
-	//printf("Initializing userspace...\n");
-	syscall_map(MAP_KEYBOARD, (u8 *)&test);
+	// TODO: Fix page fault when mallocing
+	printf("Initializing userspace...\n");
+
+	// TODO: Implement wait syscall
+	int x;
+	int f = fork();
+	if (f == 0)
+		; //wait(&x);
+	else
+		exec("/bin/sh");
 
 	//syscall_exec("/bin/sh");