yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!68 支持osThreadNew函数attr为NULL时创建线程，同时修正线程优先级的转换 

Merge pull request !68 from Caoruihong/osThreadNew
This commit is contained in:
openharmony_ci 2021-04-15 18:35:44 +08:00 committed by Gitee
parent f6151020de 2b88a46965
commit a03c2bb664
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
kal/cmsis/cmsis_liteos2.c
View File

@ -58,7 +58,12 @@ static osKernelState_t g_kernelState;
extern BOOL g_taskScheduled; extern BOOL g_taskScheduled;
#define LOS_PRIORITY_WIN 8 /* LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO <---> osPriorityNormal */
#define LOS_PRIORITY(cmsisPriority) (LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO - ((cmsisPriority) - osPriorityNormal))
#define CMSIS_PRIORITY(losPriority) (osPriorityNormal + (LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO - (losPriority)))
/* OS_TASK_PRIORITY_HIGHEST and OS_TASK_PRIORITY_LOWEST is reserved for internal TIMER and IDLE task use only. */
#define ISVALID_LOS_PRIORITY(losPrio) ((losPrio) > OS_TASK_PRIORITY_HIGHEST && (losPrio) < OS_TASK_PRIORITY_LOWEST)
const osVersion_t g_stLosVersion = { 001, 001 }; const osVersion_t g_stLosVersion = { 001, 001 };
@ -74,8 +79,6 @@ const osVersion_t g_stLosVersion = { 001, 001 };
#define KERNEL_ID "HUAWEI-LiteOS" #define KERNEL_ID "HUAWEI-LiteOS"
// ==== Kernel Management Functions ==== // ==== Kernel Management Functions ====
uint32_t osTaskStackWaterMarkGet(UINT32 taskID);
osStatus_t osKernelInitialize(void) osStatus_t osKernelInitialize(void)
{ {
@ -303,27 +306,28 @@ osThreadId_t osThreadNew(osThreadFunc_t func, void *argument, const osThreadAttr
UINT32 uwTid; UINT32 uwTid;
UINT32 uwRet; UINT32 uwRet;
LosTaskCB *pstTaskCB = NULL; LosTaskCB *pstTaskCB = NULL;
TSK_INIT_PARAM_S stTskInitParam; TSK_INIT_PARAM_S stTskInitParam = {NULL};
UINT16 usPriority;
if (OS_INT_ACTIVE) { if (OS_INT_ACTIVE || (func == NULL)) {
return NULL; return (osThreadId_t)NULL;
} }
if ((attr == NULL) || (func == NULL) || (attr->priority < osPriorityLow1) || usPriority = attr ? LOS_PRIORITY(attr->priority) : LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO;
(attr->priority > osPriorityAboveNormal6)) { if (!ISVALID_LOS_PRIORITY(usPriority)) {
/* unsupported priority */
return (osThreadId_t)NULL; return (osThreadId_t)NULL;
} }
(void)memset_s(&stTskInitParam, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S));
stTskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)func; stTskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)func;
#ifndef LITEOS_WIFI_IOT_VERSION #ifndef LITEOS_WIFI_IOT_VERSION
stTskInitParam.uwArg = (UINT32)argument; stTskInitParam.uwArg = (UINT32)argument;
#else #else
stTskInitParam.auwArgs[0] = (UINT32)argument; stTskInitParam.auwArgs[0] = (UINT32)argument;
#endif #endif
stTskInitParam.uwStackSize = attr->stack_size; stTskInitParam.uwStackSize = attr ? attr->stack_size : LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
stTskInitParam.pcName = (CHAR *)attr->name; stTskInitParam.pcName = (CHAR *)(attr ? attr->name : "[NULL]");
stTskInitParam.usTaskPrio = OS_TASK_PRIORITY_LOWEST - ((UINT16)(attr->priority) - LOS_PRIORITY_WIN); /* 0~31 */ stTskInitParam.usTaskPrio = usPriority;
uwRet = LOS_TaskCreate(&uwTid, &stTskInitParam); uwRet = LOS_TaskCreate(&uwTid, &stTskInitParam);
@ -483,12 +487,12 @@ osStatus_t osThreadSetPriority(osThreadId_t thread_id, osPriority_t priority)
return osErrorParameter; return osErrorParameter;
} }
if (priority < osPriorityLow1 || priority > osPriorityAboveNormal6) { usPriority = LOS_PRIORITY(priority);
if (!ISVALID_LOS_PRIORITY(usPriority)) {
return osErrorParameter; return osErrorParameter;
} }
pstTaskCB = (LosTaskCB *)thread_id; pstTaskCB = (LosTaskCB *)thread_id;
usPriority = OS_TASK_PRIORITY_LOWEST - ((UINT16)priority - LOS_PRIORITY_WIN);
uwRet = LOS_TaskPriSet(pstTaskCB->taskID, usPriority); uwRet = LOS_TaskPriSet(pstTaskCB->taskID, usPriority);
switch (uwRet) { switch (uwRet) {
case LOS_ERRNO_TSK_PRIOR_ERROR: case LOS_ERRNO_TSK_PRIOR_ERROR:
@ -521,7 +525,7 @@ osPriority_t osThreadGetPriority(osThreadId_t thread_id)
return osPriorityError; return osPriorityError;
} }
return (osPriority_t)(OS_TASK_PRIORITY_LOWEST - (usRet - LOS_PRIORITY_WIN)); return (osPriority_t)CMSIS_PRIORITY(usRet);
} }