diff --git a/components/iar_tls/los_iar_tls.h b/components/iar_tls/los_iar_tls.h index 07d287d6..89873fd1 100644 --- a/components/iar_tls/los_iar_tls.h +++ b/components/iar_tls/los_iar_tls.h @@ -32,7 +32,7 @@ #include "los_compiler.h" /* Using task extended field to realize IAR TLS function in target_config.h include this header file. */ -#define LOSCFG_TASK_STRUCT_EXTENSION VOID *iarTlsArea; +#define LOSCFG_TASK_STRUCT_EXTENSION VOID *iarTlsArea #if (__VER__ < 8000000) #include diff --git a/kernel/include/los_config.h b/kernel/include/los_config.h index 9b4c01a3..53baffd6 100644 --- a/kernel/include/los_config.h +++ b/kernel/include/los_config.h @@ -638,10 +638,8 @@ extern UINT8 *m_aucSysMem0; /** * @ingroup los_config * Task extension field additional functions, such as IAR TLS. + * Please Use the LOSCFG_TASK_STRUCT_EXTENSION macro to define your task extended fields in target_config.h */ -#ifndef LOSCFG_TASK_STRUCT_EXTENSION -#define LOSCFG_TASK_STRUCT_EXTENSION -#endif #ifndef LOSCFG_TASK_CREATE_EXTENSION_HOOK #define LOSCFG_TASK_CREATE_EXTENSION_HOOK(taskCB) #endif diff --git a/kernel/include/los_task.h b/kernel/include/los_task.h index ce8441df..1560a27e 100644 --- a/kernel/include/los_task.h +++ b/kernel/include/los_task.h @@ -1500,7 +1500,9 @@ typedef struct { #if (LOSCFG_KERNEL_SIGNAL == 1) VOID *sig; /**< Task signal */ #endif - LOSCFG_TASK_STRUCT_EXTENSION /**< Task extension field */ +#ifdef LOSCFG_TASK_STRUCT_EXTENSION + LOSCFG_TASK_STRUCT_EXTENSION; /**< Task extension field */ +#endif } LosTaskCB; STATIC INLINE BOOL OsTaskIsExit(const LosTaskCB *taskCB)