From 437a30d11704466628a4970acc59636329bcaa90 Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Thu, 2 Dec 2021 13:18:54 +0800 Subject: [PATCH] arch/tcbinfo: fix build break if task name disabled Signed-off-by: chao.an --- arch/arm/src/arm/arm_tcbinfo.c | 7 +++++++ arch/arm/src/armv6-m/arm_tcbinfo.c | 7 +++++++ arch/arm/src/armv7-a/arm_tcbinfo.c | 7 +++++++ arch/arm/src/armv7-m/arm_tcbinfo.c | 7 +++++++ arch/arm/src/armv7-r/arm_tcbinfo.c | 7 +++++++ arch/arm/src/armv8-m/arm_tcbinfo.c | 7 +++++++ arch/risc-v/src/common/riscv_tcbinfo.c | 7 +++++++ include/nuttx/sched.h | 2 ++ 8 files changed, 51 insertions(+) diff --git a/arch/arm/src/arm/arm_tcbinfo.c b/arch/arm/src/arm/arm_tcbinfo.c index f2e9745ac7..2438ded272 100644 --- a/arch/arm/src/arm/arm_tcbinfo.c +++ b/arch/arm/src/arm/arm_tcbinfo.c @@ -38,7 +38,9 @@ const struct tcbinfo_s g_tcbinfo = TCB_PID_OFF, TCB_STATE_OFF, TCB_PRI_OFF, +#if CONFIG_TASK_NAME_SIZE > 0 TCB_NAME_OFF, +#endif XCPTCONTEXT_REGS, @@ -62,3 +64,8 @@ const struct tcbinfo_s g_tcbinfo = }; #endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + diff --git a/arch/arm/src/armv6-m/arm_tcbinfo.c b/arch/arm/src/armv6-m/arm_tcbinfo.c index 45be31703d..989fd353b7 100644 --- a/arch/arm/src/armv6-m/arm_tcbinfo.c +++ b/arch/arm/src/armv6-m/arm_tcbinfo.c @@ -38,7 +38,9 @@ const struct tcbinfo_s g_tcbinfo = TCB_PID_OFF, TCB_STATE_OFF, TCB_PRI_OFF, +#if CONFIG_TASK_NAME_SIZE > 0 TCB_NAME_OFF, +#endif XCPTCONTEXT_REGS, @@ -69,3 +71,8 @@ const struct tcbinfo_s g_tcbinfo = }; #endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + diff --git a/arch/arm/src/armv7-a/arm_tcbinfo.c b/arch/arm/src/armv7-a/arm_tcbinfo.c index 814ce321be..84de7bbbb0 100644 --- a/arch/arm/src/armv7-a/arm_tcbinfo.c +++ b/arch/arm/src/armv7-a/arm_tcbinfo.c @@ -38,7 +38,9 @@ const struct tcbinfo_s g_tcbinfo = TCB_PID_OFF, TCB_STATE_OFF, TCB_PRI_OFF, +#if CONFIG_TASK_NAME_SIZE > 0 TCB_NAME_OFF, +#endif XCPTCONTEXT_REGS, @@ -106,3 +108,8 @@ const struct tcbinfo_s g_tcbinfo = }; #endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + diff --git a/arch/arm/src/armv7-m/arm_tcbinfo.c b/arch/arm/src/armv7-m/arm_tcbinfo.c index c679e5a07d..d9e3321a97 100644 --- a/arch/arm/src/armv7-m/arm_tcbinfo.c +++ b/arch/arm/src/armv7-m/arm_tcbinfo.c @@ -38,7 +38,9 @@ const struct tcbinfo_s g_tcbinfo = TCB_PID_OFF, TCB_STATE_OFF, TCB_PRI_OFF, +#if CONFIG_TASK_NAME_SIZE > 0 TCB_NAME_OFF, +#endif XCPTCONTEXT_REGS, @@ -112,3 +114,8 @@ const struct tcbinfo_s g_tcbinfo = }; #endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + diff --git a/arch/arm/src/armv7-r/arm_tcbinfo.c b/arch/arm/src/armv7-r/arm_tcbinfo.c index 4f732e348d..7124b6b3c4 100644 --- a/arch/arm/src/armv7-r/arm_tcbinfo.c +++ b/arch/arm/src/armv7-r/arm_tcbinfo.c @@ -38,7 +38,9 @@ const struct tcbinfo_s g_tcbinfo = TCB_PID_OFF, TCB_STATE_OFF, TCB_PRI_OFF, +#if CONFIG_TASK_NAME_SIZE > 0 TCB_NAME_OFF, +#endif XCPTCONTEXT_REGS, @@ -106,3 +108,8 @@ const struct tcbinfo_s g_tcbinfo = }; #endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + diff --git a/arch/arm/src/armv8-m/arm_tcbinfo.c b/arch/arm/src/armv8-m/arm_tcbinfo.c index 96637da082..f34eb0f608 100644 --- a/arch/arm/src/armv8-m/arm_tcbinfo.c +++ b/arch/arm/src/armv8-m/arm_tcbinfo.c @@ -38,7 +38,9 @@ const struct tcbinfo_s g_tcbinfo = TCB_PID_OFF, TCB_STATE_OFF, TCB_PRI_OFF, +#if CONFIG_TASK_NAME_SIZE > 0 TCB_NAME_OFF, +#endif XCPTCONTEXT_REGS, @@ -112,3 +114,8 @@ const struct tcbinfo_s g_tcbinfo = }; #endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + diff --git a/arch/risc-v/src/common/riscv_tcbinfo.c b/arch/risc-v/src/common/riscv_tcbinfo.c index 530378b0db..5599587132 100644 --- a/arch/risc-v/src/common/riscv_tcbinfo.c +++ b/arch/risc-v/src/common/riscv_tcbinfo.c @@ -38,7 +38,9 @@ const struct tcbinfo_s g_tcbinfo = TCB_PID_OFF, TCB_STATE_OFF, TCB_PRI_OFF, +#if CONFIG_TASK_NAME_SIZE > 0 TCB_NAME_OFF, +#endif XCPTCONTEXT_REGS, @@ -116,3 +118,8 @@ const struct tcbinfo_s g_tcbinfo = }; #endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h index 676dcd997b..667751ad5a 100644 --- a/include/nuttx/sched.h +++ b/include/nuttx/sched.h @@ -189,7 +189,9 @@ # define TCB_PID_OFF (offsetof(struct tcb_s, pid)) # define TCB_STATE_OFF (offsetof(struct tcb_s, task_state)) # define TCB_PRI_OFF (offsetof(struct tcb_s, sched_priority)) +#if CONFIG_TASK_NAME_SIZE > 0 # define TCB_NAME_OFF (offsetof(struct tcb_s, name)) +#endif # define TCB_REG_OFF(reg) (offsetof(struct tcb_s, xcp.regs[reg])) #endif