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

!259 完善CMSIS-RTOS V2部分接口（osSemaphoreNew，osThreadJoin） 

Merge pull request !259 from Caoruihong/cmsis
This commit is contained in:
openharmony_ci 2021-09-24 02:24:11 +00:00 committed by Gitee
parent 8be34cb78e d478152762
commit af8a6d5047
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kal/cmsis/cmsis_liteos2.c
View File

@ -1129,8 +1129,9 @@ osStatus_t osMutexDelete(osMutexId_t mutex_id)
osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count, const osSemaphoreAttr_t *attr) osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count, const osSemaphoreAttr_t *attr)
{ {
UINT32 uwRet; UINT32 uwRet = LOS_NOK;
UINT32 uwSemId; UINT32 uwSemId;
UINT32 intSave;
UNUSED(attr); UNUSED(attr);
@ -1138,14 +1139,16 @@ osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count, const
return (osSemaphoreId_t)NULL; return (osSemaphoreId_t)NULL;
} }
if (1 == max_count) { if (max_count > 0 && max_count <= OS_SEM_COUNTING_MAX_COUNT) {
uwRet = LOS_BinarySemCreate((UINT16)initial_count, &uwSemId);
} else {
uwRet = LOS_SemCreate((UINT16)initial_count, &uwSemId); uwRet = LOS_SemCreate((UINT16)initial_count, &uwSemId);
} }
if (uwRet == LOS_OK) { if (uwRet == LOS_OK) {
return (osSemaphoreId_t)(GET_SEM(uwSemId)); osSemaphoreId_t semaphore_id = (osSemaphoreId_t)(GET_SEM(uwSemId));
intSave = LOS_IntLock();
((LosSemCB *)semaphore_id)->maxSemCount = max_count;
LOS_IntRestore(intSave);
return semaphore_id;
} else { } else {
return (osSemaphoreId_t)NULL; return (osSemaphoreId_t)NULL;
} }