From 43184e40b14a5e41383ffb053e7c69c93ff81036 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 7 May 2020 22:16:09 +0200
Subject: Some debugging and fixing

Still didn't fix the bugs
---
 src/userspace/programs/init.c | 28 ++++++++++++++++++----------
 src/userspace/programs/sh.c   |  2 +-
 2 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'src/userspace/programs')

diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index 1d53ee8..e749e2f 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -5,6 +5,11 @@
 #include <unistd.h>
 #include <gui.h>
 
+void test(u8 *data)
+{
+	printf(".");
+}
+
 void main()
 {
 	if (get_pid() != 2) {
@@ -15,19 +20,22 @@ void main()
 	// TODO: Fix page fault when mallocing
 	printf("Initializing userspace...\n");
 
+	// TODO: Find out, why init gets PID 1 and stops
+	syscall_map(MAP_KEYBOARD, (u8)&test);
+
 	// TODO: Fix occasional race conditions with cli/sti
 	// TODO: Fix scheduler turning off randomly..
-	u32 x;
-	u32 f = fork();
-	if (f == 0) {
-		printf("Waiting...\n");
-		wait(&x);
-	} else {
-		printf("Executing...\n");
-		exec("/bin/sh");
-	}
+	/* u32 x; */
+	/* u32 f = fork(); */
+	/* if (f == 0) { */
+	/* 	printf("Waiting...\n"); */
+	/* 	wait(&x); */
+	/* } else { */
+	/* 	printf("Executing...\n"); */
+	/* 	exec("/bin/sh"); */
+	/* } */
 
 	while (1) {
 		//printf("B");
 	};
-}
\ No newline at end of file
+}
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index 12f8b2c..fc6b6d6 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -18,4 +18,4 @@ void main()
 	while (1) {
 		//printf("A");
 	};
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3