experimenting wih userspace and syscalls

1 files changed, 6 insertions, 11 deletions

diff --git a/userspace/syscalls.c b/userspace/syscalls.c
index 7471418..fd9b5ba 100644
--- a/userspace/syscalls.c
+++ b/userspace/syscalls.c
@@ -4,14 +4,15 @@
 #include "../kernel/syscalls.h"
 
 /*
-char *__env1[]={0};
-char *__env2[]={"dupa","test"};
-char **environ={__env1,__env2};
+char *__env3[]={0};
+char *__env1[]={"a=10","b=20"};
+char *__env2[]={"dupa=test2"};
+char **environ={__env1,__env2,__env3};
 */
 
 void _exit(int ret)
 {
-while(1);
+    while(1);
 }
 
 // generic syscall interface!
@@ -87,14 +88,8 @@ int execve(char *name, char **argv, char **env)
     return syscall(SYSCALL_EXECVE,name,argv,env);
 }
 
-
-caddr_t sbrk(int incr) 
+uint32_t sbrk(int incr) 
 {
-    static int alloc=0x300000; // TODO: implement properly sbrk!!!
-    int oldalloc=alloc;
-    alloc+=incr;
-    return oldalloc;
-
     return syscall(SYSCALL_SBRK,incr,0,0);
 }