diff options
Diffstat (limited to 'src/userspace')
-rw-r--r-- | src/userspace/libc/stdio/vprintf.c | 2 | ||||
-rw-r--r-- | src/userspace/libc/stdlib/atoi.c | 2 | ||||
-rw-r--r-- | src/userspace/libc/stdlib/htoi.c | 4 | ||||
-rw-r--r-- | src/userspace/libc/stdlib/itoa.c | 2 | ||||
-rw-r--r-- | src/userspace/libc/syscall.c | 2 | ||||
-rw-r--r-- | src/userspace/libgui/draw.c | 2 | ||||
-rw-r--r-- | src/userspace/libgui/init.c | 2 | ||||
-rw-r--r-- | src/userspace/libgui/util.c | 2 | ||||
-rw-r--r-- | src/userspace/programs/init.c | 6 | ||||
-rw-r--r-- | src/userspace/programs/root.c | 2 | ||||
-rw-r--r-- | src/userspace/programs/sh.c | 10 |
11 files changed, 18 insertions, 18 deletions
diff --git a/src/userspace/libc/stdio/vprintf.c b/src/userspace/libc/stdio/vprintf.c index dc5ed23..691f153 100644 --- a/src/userspace/libc/stdio/vprintf.c +++ b/src/userspace/libc/stdio/vprintf.c @@ -1,5 +1,5 @@ -#include <stdint.h> #include <stdarg.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/userspace/libc/stdlib/atoi.c b/src/userspace/libc/stdlib/atoi.c index dbfe0cb..80897eb 100644 --- a/src/userspace/libc/stdlib/atoi.c +++ b/src/userspace/libc/stdlib/atoi.c @@ -1,7 +1,7 @@ +#include <math.h> #include <stddef.h> #include <stdint.h> #include <string.h> -#include <math.h> int atoi(char *str) { diff --git a/src/userspace/libc/stdlib/htoi.c b/src/userspace/libc/stdlib/htoi.c index 8897d20..0d0ab30 100644 --- a/src/userspace/libc/stdlib/htoi.c +++ b/src/userspace/libc/stdlib/htoi.c @@ -1,6 +1,6 @@ -#include <stdint.h> -#include <stddef.h> #include <math.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> int htoi(char *str) diff --git a/src/userspace/libc/stdlib/itoa.c b/src/userspace/libc/stdlib/itoa.c index b8aa73e..b960796 100644 --- a/src/userspace/libc/stdlib/itoa.c +++ b/src/userspace/libc/stdlib/itoa.c @@ -1,6 +1,6 @@ +#include <math.h> #include <stdint.h> #include <stdlib.h> -#include <math.h> #include <string.h> static const char ITOA_TABLE[] = "0123456789"; diff --git a/src/userspace/libc/syscall.c b/src/userspace/libc/syscall.c index 4b5c200..5a9fda8 100644 --- a/src/userspace/libc/syscall.c +++ b/src/userspace/libc/syscall.c @@ -1,5 +1,5 @@ -#include <stdint.h> #include <common.h> +#include <stdint.h> #include <syscall.h> /** diff --git a/src/userspace/libgui/draw.c b/src/userspace/libgui/draw.c index ee35d3c..4576808 100644 --- a/src/userspace/libgui/draw.c +++ b/src/userspace/libgui/draw.c @@ -1,6 +1,6 @@ +#include <gui.h> #include <stdint.h> #include <stdio.h> -#include <gui.h> void gui_draw_rectangle(int x1, int y1, int x2, int y2, const u32 color[3]) { diff --git a/src/userspace/libgui/init.c b/src/userspace/libgui/init.c index 04d6b49..2e5d9c5 100644 --- a/src/userspace/libgui/init.c +++ b/src/userspace/libgui/init.c @@ -1,7 +1,7 @@ +#include <gui.h> #include <stdint.h> #include <stdio.h> #include <syscall.h> -#include <gui.h> struct pointers *pointers; diff --git a/src/userspace/libgui/util.c b/src/userspace/libgui/util.c index 5019175..f108822 100644 --- a/src/userspace/libgui/util.c +++ b/src/userspace/libgui/util.c @@ -1,5 +1,5 @@ -#include <stdint.h> #include <gui.h> +#include <stdint.h> void gui_convert_color(u32 *color_array, u32 color) { 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 |