nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

syscall: nx_task_spawn should exist in the flat build just like the protected build

Browse source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-05-02 18:36:48 +08:00 committed by patacongo
parent 54d0256b9a
commit 31c60c3b0e
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/nuttx/spawn.h
View file

@ -135,7 +135,7 @@ extern "C"
void add_file_action(FAR posix_spawn_file_actions_t *file_action,
FAR struct spawn_general_file_action_s *entry);
#ifdef CONFIG_BUILD_PROTECTED
#if defined(CONFIG_LIB_SYSCALL) && !defined(CONFIG_BUILD_KERNEL)
int nx_task_spawn(FAR const struct spawn_syscall_parms_s *parms);
#endif

5
libs/libc/spawn/Make.defs
View file

@ -48,11 +48,10 @@ CSRCS += lib_psa_setschedpolicy.c lib_psa_getsigmask.c lib_psa_setsigmask.c
ifneq ($(CONFIG_BUILD_KERNEL),y)
CSRCS += lib_psa_getstacksize.c lib_psa_setstacksize.c
endif
ifeq ($(CONFIG_BUILD_PROTECTED),y)
ifeq ($(CONFIG_LIB_SYSCALL),y)
CSRCS += lib_task_spawn.c
endif
endif
ifeq ($(CONFIG_DEBUG_FEATURES),y)
CSRCS += lib_psa_dump.c

4
libs/libc/spawn/lib_task_spawn.c
View file

@ -42,7 +42,7 @@
#include <spawn.h>
#include <nuttx/spawn.h>
#ifdef CONFIG_BUILD_PROTECTED
#if defined(CONFIG_LIB_SYSCALL) && !defined(CONFIG_BUILD_KERNEL)
/****************************************************************************
* Public Functions
@ -91,4 +91,4 @@ int task_spawn(FAR pid_t *pid, FAR const char *name, main_t entry,
return nx_task_spawn(&parms);
}
#endif /* CONFIG_BUILD_PROTECTED */
#endif /* CONFIG_LIB_SYSCALL && !CONFIG_BUILD_KERNEL */

4
sched/task/task_spawn.c
View file

@ -99,7 +99,7 @@ static int nxtask_spawn_exec(FAR pid_t *pidp, FAR const char *name,
sched_lock();
/* Use the default task priority and stack size if no attributes are provided */
/* Use the default priority and stack size if no attributes are provided */
if (attr)
{
@ -459,7 +459,7 @@ errout_with_lock:
*
****************************************************************************/
#ifdef CONFIG_BUILD_PROTECTED
#ifdef CONFIG_LIB_SYSCALL
int nx_task_spawn(FAR const struct spawn_syscall_parms_s *parms)
{
DEBUGASSERT(parms != NULL);

2
syscall/syscall.csv
View file

@ -64,7 +64,7 @@
"mq_timedreceive","mqueue.h","!defined(CONFIG_DISABLE_MQUEUE)","ssize_t","mqd_t","char*","size_t","FAR unsigned int*","const struct timespec*"
"mq_timedsend","mqueue.h","!defined(CONFIG_DISABLE_MQUEUE)","int","mqd_t","const char*","size_t","unsigned int","const struct timespec*"
"mq_unlink","mqueue.h","!defined(CONFIG_DISABLE_MQUEUE)","int","const char*"
"nx_task_spawn","nuttx/spawn.h","defined(CONFIG_BUILD_PROTECTED)","int","FAR const struct spawn_syscall_parms_s *"
"nx_task_spawn","nuttx/spawn.h","defined(CONFIG_LIB_SYSCALL) && !defined(CONFIG_BUILD_KERNEL)","int","FAR const struct spawn_syscall_parms_s *"
"nx_vsyslog","nuttx/syslog/syslog.h","","int","int","FAR const IPTR char*","FAR va_list*"
"on_exit","stdlib.h","defined(CONFIG_SCHED_ONEXIT)","int","CODE void (*)(int, FAR void *)","FAR void *"
"open","fcntl.h","","int","const char*","int","..."

Can't render this file because it has a wrong number of fields in line 2.

2
syscall/syscall_lookup.h
View file

@ -83,7 +83,7 @@ SYSCALL_LOOKUP(sem_unlink, 1, STUB_sem_unlink)
#ifndef CONFIG_BUILD_KERNEL
SYSCALL_LOOKUP(task_create, 5, STUB_task_create)
#ifdef CONFIG_BUILD_PROTECTED
#ifdef CONFIG_LIB_SYSCALL
SYSCALL_LOOKUP(nx_task_spawn, 1, STUB_nx_task_spawn)
#endif
#else