aboutsummaryrefslogtreecommitdiff
path: root/src/userspace
diff options
context:
space:
mode:
Diffstat (limited to 'src/userspace')
-rw-r--r--src/userspace/libc/unistd.h4
-rw-r--r--src/userspace/libc/unistd/read.c2
-rw-r--r--src/userspace/libc/unistd/write.c2
-rw-r--r--src/userspace/programs/init.c7
-rw-r--r--src/userspace/programs/sh.c2
5 files changed, 10 insertions, 7 deletions
diff --git a/src/userspace/libc/unistd.h b/src/userspace/libc/unistd.h
index e8b97be..f9644f1 100644
--- a/src/userspace/libc/unistd.h
+++ b/src/userspace/libc/unistd.h
@@ -11,8 +11,8 @@ u32 fork();
u32 get_pid();
-u32 sys_read(char *path, u32 offset, u32 count, char *buf);
+u32 read(char *path, u32 offset, u32 count, char *buf);
-u32 sys_write(char *path, u32 offset, u32 count, char *buf);
+u32 write(char *path, u32 offset, u32 count, char *buf);
#endif \ No newline at end of file
diff --git a/src/userspace/libc/unistd/read.c b/src/userspace/libc/unistd/read.c
index c01baa7..0f8b914 100644
--- a/src/userspace/libc/unistd/read.c
+++ b/src/userspace/libc/unistd/read.c
@@ -1,7 +1,7 @@
#include <stdint.h>
#include <syscall.h>
-u32 sys_read(char *path, u32 offset, u32 count, char *buf)
+u32 read(char *path, u32 offset, u32 count, char *buf)
{
return syscall_read(path, offset, count, buf);
} \ No newline at end of file
diff --git a/src/userspace/libc/unistd/write.c b/src/userspace/libc/unistd/write.c
index c3eec3d..7cae9cd 100644
--- a/src/userspace/libc/unistd/write.c
+++ b/src/userspace/libc/unistd/write.c
@@ -1,7 +1,7 @@
#include <stdint.h>
#include <syscall.h>
-u32 sys_write(char *path, u32 offset, u32 count, char *buf)
+u32 write(char *path, u32 offset, u32 count, char *buf)
{
return syscall_write(path, offset, count, buf);
} \ No newline at end of file
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index 4127e19..732c104 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -1,13 +1,14 @@
#include <stdio.h>
#include <stdlib.h>
#include <syscall.h>
+#include <unistd.h>
#include <gui.h>
void main()
{
- gui_init();
- gui_screen_clear();
- 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 6913e05..f22a528 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -1,9 +1,11 @@
#include <stdio.h>
+#include <unistd.h>
#include <syscall.h>
#include <gui.h>
void main()
{
+ write("/dev/fb", 0, 5, "hallo");
printf("[~] ");
while (1) {