diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-27 14:19:41 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-27 14:19:41 -0600 |
commit | a573572c3eae44b191b98e4cbe543a23bba27233 (patch) | |
tree | ae8773fb6090507ca667824f863221a57477bc3e | |
parent | e7723401ed547d5859bdbf4804a5c1f056858a6b (diff) | |
download | nuttx-a573572c3eae44b191b98e4cbe543a23bba27233.tar.gz nuttx-a573572c3eae44b191b98e4cbe543a23bba27233.tar.bz2 nuttx-a573572c3eae44b191b98e4cbe543a23bba27233.zip |
Can't used task_create() if address environments enabled
-rw-r--r-- | nuttx/include/sys/syscall.h | 18 | ||||
-rw-r--r-- | nuttx/syscall/syscall.csv | 2 | ||||
-rw-r--r-- | nuttx/syscall/syscall_lookup.h | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/nuttx/include/sys/syscall.h b/nuttx/include/sys/syscall.h index b7e76f032..e5386eb3b 100644 --- a/nuttx/include/sys/syscall.h +++ b/nuttx/include/sys/syscall.h @@ -91,11 +91,19 @@ #define SYS_sem_unlink (CONFIG_SYS_RESERVED+19) #define SYS_sem_wait (CONFIG_SYS_RESERVED+20) #define SYS_set_errno (CONFIG_SYS_RESERVED+21) -#define SYS_task_create (CONFIG_SYS_RESERVED+22) -#define SYS_task_delete (CONFIG_SYS_RESERVED+23) -#define SYS_task_restart (CONFIG_SYS_RESERVED+24) -#define SYS_up_assert (CONFIG_SYS_RESERVED+25) -#define __SYS_vfork (CONFIG_SYS_RESERVED+26) + +#ifndef CONFIG_ARCH_ADDRENV +# define SYS_task_create (CONFIG_SYS_RESERVED+22) +# define SYS_task_delete (CONFIG_SYS_RESERVED+23) +# define SYS_task_restart (CONFIG_SYS_RESERVED+24) +# define SYS_up_assert (CONFIG_SYS_RESERVED+25) +# define __SYS_vfork (CONFIG_SYS_RESERVED+26) +#else +# define SYS_task_delete (CONFIG_SYS_RESERVED+22) +# define SYS_task_restart (CONFIG_SYS_RESERVED+23) +# define SYS_up_assert (CONFIG_SYS_RESERVED+24) +# define __SYS_vfork (CONFIG_SYS_RESERVED+25) +#endif /* The following can be individually enabled */ diff --git a/nuttx/syscall/syscall.csv b/nuttx/syscall/syscall.csv index 26adaf3a1..3c734d2d7 100644 --- a/nuttx/syscall/syscall.csv +++ b/nuttx/syscall/syscall.csv @@ -124,7 +124,7 @@ "stat","sys/stat.h","CONFIG_NFILE_DESCRIPTORS > 0","int","const char*","FAR struct stat*" #"statfs","stdio.h","","int","FAR const char*","FAR struct statfs*" "statfs","sys/statfs.h","CONFIG_NFILE_DESCRIPTORS > 0","int","const char*","struct statfs*" -"task_create","sched.h","","int","const char*","int","int","main_t","FAR char * const []|FAR char * const *" +"task_create","sched.h","!defined(CONFIG_ARCH_ADDRENV)","int","FAR const char*","int","int","main_t","FAR char * const []|FAR char * const *" #"task_create","sched.h","","int","const char*","int","main_t","FAR char * const []|FAR char * const *" "task_delete","sched.h","","int","pid_t" "task_restart","sched.h","","int","pid_t" diff --git a/nuttx/syscall/syscall_lookup.h b/nuttx/syscall/syscall_lookup.h index e5a940148..c3284187c 100644 --- a/nuttx/syscall/syscall_lookup.h +++ b/nuttx/syscall/syscall_lookup.h @@ -65,7 +65,9 @@ SYSCALL_LOOKUP(sem_trywait, 1, STUB_sem_trywait) SYSCALL_LOOKUP(sem_unlink, 1, STUB_sem_unlink) SYSCALL_LOOKUP(sem_wait, 1, STUB_sem_wait) SYSCALL_LOOKUP(set_errno, 1, STUB_set_errno) +#ifndef CONFIG_ARCH_ADDRENV SYSCALL_LOOKUP(task_create, 5, STUB_task_create) +#endif SYSCALL_LOOKUP(task_delete, 1, STUB_task_delete) SYSCALL_LOOKUP(task_restart, 1, STUB_task_restart) SYSCALL_LOOKUP(up_assert, 2, STUB_up_assert) |