aboutsummaryrefslogtreecommitdiff
path: root/src/userspace
diff options
context:
space:
mode:
authorMarvin Borner2020-04-30 20:27:06 +0200
committerMarvin Borner2020-04-30 20:27:06 +0200
commit6c5e31b1e5534748f89233cdebf778247b040cbc (patch)
treed85b9c4905ad7c6d56c29133bca9b9cc2eb28159 /src/userspace
parent8b52d7698e4a9a5abaf730c7da1c4f865cb78f8e (diff)
Started vfs
Diffstat (limited to 'src/userspace')
-rw-r--r--src/userspace/libgui/init.c6
-rw-r--r--src/userspace/programs/init.c3
-rw-r--r--src/userspace/programs/sh.c4
3 files changed, 7 insertions, 6 deletions
diff --git a/src/userspace/libgui/init.c b/src/userspace/libgui/init.c
index 04d7ac3..ecc65d2 100644
--- a/src/userspace/libgui/init.c
+++ b/src/userspace/libgui/init.c
@@ -20,7 +20,7 @@ void gui_init()
// TODO: Why tf is the kheap magic stored in the first few bytes?!
fb = (pointers->mode_info->framebuffer << 16);
- gui_screen_clear();
- printf("%dx%dx%d\n", vbe_width, vbe_height, vbe_bpl << 3);
- printf("0x%x\n", fb);
+ /* gui_screen_clear(); */
+ /* printf("%dx%dx%d\n", vbe_width, vbe_height, vbe_bpl << 3); */
+ /* printf("0x%x\n", fb); */
} \ No newline at end of file
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index 3c1d51f..4127e19 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -5,8 +5,9 @@
void main()
{
- printf("Initializing userspace...\n");
gui_init();
+ gui_screen_clear();
+ printf("Initializing userspace...\n");
syscall_exec("/bin/sh");
while (1) {
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index 8da493e..6913e05 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -1,9 +1,9 @@
-#include <syscall.h>
#include <stdio.h>
+#include <syscall.h>
+#include <gui.h>
void main()
{
- printf("Test for printf! %d\n", 42);
printf("[~] ");
while (1) {