From 9369b75ee540b0aa11340e85a73b0c342cfb5bce Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Fri, 7 Jul 2023 12:00:25 +0300 Subject: [PATCH] includes/nuttx: fix _SCHED_GET(T/P/PP)ID definition issue Signed-off-by: Petro Karashchenko --- include/nuttx/sched.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h index b77c19106be..3229f94b2bf 100644 --- a/include/nuttx/sched.h +++ b/include/nuttx/sched.h @@ -148,6 +148,9 @@ */ #if !defined(CONFIG_BUILD_FLAT) && defined(__KERNEL__) +# define _SCHED_GETTID() nxsched_gettid() +# define _SCHED_GETPID() nxsched_getpid() +# define _SCHED_GETPPID() nxsched_getppid() # define _SCHED_GETPARAM(t,p) nxsched_get_param(t,p) # define _SCHED_SETPARAM(t,p) nxsched_set_param(t,p) # define _SCHED_GETSCHEDULER(t) nxsched_get_scheduler(t) @@ -157,6 +160,9 @@ # define _SCHED_ERRNO(r) (-(r)) # define _SCHED_ERRVAL(r) (r) #else +# define _SCHED_GETTID() gettid() +# define _SCHED_GETPID() getpid() +# define _SCHED_GETPPID() getppid() # define _SCHED_GETPARAM(t,p) sched_getparam(t,p) # define _SCHED_SETPARAM(t,p) sched_setparam(t,p) # define _SCHED_GETSCHEDULER(t) sched_getscheduler(t) @@ -167,16 +173,6 @@ # define _SCHED_ERRVAL(r) (-errno) #endif -#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) -# define _SCHED_GETTID() nxsched_gettid() -# define _SCHED_GETPID() nxsched_getpid() -# define _SCHED_GETPPID() nxsched_getppid() -#else -# define _SCHED_GETTID() gettid() -# define _SCHED_GETPID() getpid() -# define _SCHED_GETPPID() getppid() -#endif - #ifdef CONFIG_DEBUG_TCBINFO # define TCB_PID_OFF offsetof(struct tcb_s, pid) # define TCB_STATE_OFF offsetof(struct tcb_s, task_state)