From 9b2e28ad7a752c0fe7b60e73ca43c827b45b3ee8 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 7 May 2020 22:19:13 +0200
Subject: Added and applied include-sorting

Worked better than I thought!
---
 src/userspace/programs/init.c |  6 +++---
 src/userspace/programs/root.c |  2 +-
 src/userspace/programs/sh.c   | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/userspace/programs')

diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index e749e2f..6cb80ce 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -1,9 +1,9 @@
+#include <common.h>
+#include <gui.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <common.h>
 #include <syscall.h>
 #include <unistd.h>
-#include <gui.h>
 
 void test(u8 *data)
 {
@@ -21,7 +21,7 @@ void main()
 	printf("Initializing userspace...\n");
 
 	// TODO: Find out, why init gets PID 1 and stops
-	syscall_map(MAP_KEYBOARD, (u8)&test);
+	syscall_map(MAP_KEYBOARD, (u32)&test);
 
 	// TODO: Fix occasional race conditions with cli/sti
 	// TODO: Fix scheduler turning off randomly..
diff --git a/src/userspace/programs/root.c b/src/userspace/programs/root.c
index d02f72c..86b8bf7 100644
--- a/src/userspace/programs/root.c
+++ b/src/userspace/programs/root.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include <unistd.h>
 #include <syscall.h>
+#include <unistd.h>
 
 // This process only exists because it can't crash
 void main()
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index fc6b6d6..f8f93f3 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -1,10 +1,10 @@
+#include <common.h>
+#include <gui.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stddef.h>
-#include <common.h>
-#include <unistd.h>
 #include <syscall.h>
-#include <gui.h>
+#include <unistd.h>
 
 void main()
 {
@@ -18,4 +18,4 @@ void main()
 	while (1) {
 		//printf("A");
 	};
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3