Explorar o código

!538 [lwP] code cleanup for syscall
Merge pull request !538 from bernard/bernard_rt-smart

bernard %!s(int64=3) %!d(string=hai) anos
pai
achega
552f210010
Modificáronse 1 ficheiros con 11 adicións e 20 borrados
  1. 11 20
      components/lwp/lwp_syscall.c

+ 11 - 20
components/lwp/lwp_syscall.c

@@ -1113,25 +1113,32 @@ rt_err_t sys_mutex_release(rt_mutex_t mutex)
 
 #ifdef RT_USING_USERSPACE
 /* memory allocation */
-extern rt_base_t lwp_brk(void *addr);
 rt_base_t sys_brk(void *addr)
 {
     return lwp_brk(addr);
 }
 
-extern void *lwp_mmap2(void *addr, size_t length, int prot,
-        int flags, int fd, off_t pgoffset);
 void *sys_mmap2(void *addr, size_t length, int prot,
         int flags, int fd, off_t pgoffset)
 {
     return lwp_mmap2(addr, length, prot, flags, fd, pgoffset);
 }
 
-extern int lwp_munmap(void *addr);
 int sys_munmap(void *addr, size_t length)
 {
     return lwp_munmap(addr);
 }
+
+void *sys_mremap(void *old_address, size_t old_size,
+             size_t new_size, int flags, void *new_address)
+{
+    return (void *)-1;
+}
+
+int sys_madvise(void *addr, size_t len, int behav)
+{
+    return -ENOSYS;
+}
 #endif
 
 rt_event_t sys_event_create(const char *name, rt_uint8_t flag)
@@ -2405,8 +2412,6 @@ rt_err_t sys_channel_recv_timeout(int fd, rt_channel_msg_t data, rt_int32_t time
     return lwp_channel_recv_timeout(FDT_TYPE_LWP, fd, data, time);
 }
 
-/*****/
-
 static struct rt_semaphore critical_lock;
 
 static int critical_init(void)
@@ -3986,20 +3991,6 @@ int sys_getrandom(void *buf, size_t buflen, unsigned int flags)
     return ret;
 }
 
-#ifdef RT_USING_USERSPACE
-/* memory allocation */
-void *sys_mremap(void *old_address, size_t old_size,
-             size_t new_size, int flags, void *new_address)
-{
-    return (void *)-1;
-}
-
-int sys_madvise(void *addr, size_t len, int behav)
-{
-    return -ENOSYS;
-}
-#endif
-
 int sys_setaffinity(pid_t pid, size_t size, void *set)
 {
     if (!lwp_user_accessable(set, sizeof(cpu_set_t)))