From 31767b532e69c5a63df0106fa08e137e3106a449 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 7 May 2020 00:16:52 +0200
Subject: Some fixes here and there...

Also implemented serial console in userspace
---
 src/userspace/programs/init.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/userspace/programs/init.c')

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");
 
-- 
cgit v1.2.3