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

!115 fix: correct spelling 

Merge pull request !115 from rtos-lover/los_swtmr
This commit is contained in:
openharmony_ci 2021-05-15 09:45:21 +08:00 committed by Gitee
parent 62f6531539 dd5cefb0da
commit 8ef21e0b41
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/src/los_swtmr.c
View File

@ -43,7 +43,7 @@
LITE_OS_SEC_BSS UINT32 g_swtmrHandlerQueue; /* Software Timer timeout queue ID */ LITE_OS_SEC_BSS UINT32 g_swtmrHandlerQueue; /* Software Timer timeout queue ID */
LITE_OS_SEC_BSS SWTMR_CTRL_S *g_swtmrCBArray = NULL; /* first address in Timer memory space */ LITE_OS_SEC_BSS SWTMR_CTRL_S *g_swtmrCBArray = NULL; /* first address in Timer memory space */
LITE_OS_SEC_BSS SWTMR_CTRL_S *g_swtmrFreeList = NULL; /* Free list of Softwaer Timer */ LITE_OS_SEC_BSS SWTMR_CTRL_S *g_swtmrFreeList = NULL; /* Free list of Software Timer */
LITE_OS_SEC_BSS SortLinkAttribute *g_swtmrSortLinkList = NULL; /* The software timer count list */ LITE_OS_SEC_BSS SortLinkAttribute *g_swtmrSortLinkList = NULL; /* The software timer count list */
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1) #if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
@ -70,14 +70,14 @@ Return : None
LITE_OS_SEC_TEXT VOID OsSwtmrTask(VOID) LITE_OS_SEC_TEXT VOID OsSwtmrTask(VOID)
{ {
SwtmrHandlerItem swtmrHandle; SwtmrHandlerItem swtmrHandle;
UINT32 readSzie; UINT32 readSize;
UINT32 ret; UINT32 ret;
UINT64 tick; UINT64 tick;
readSzie = sizeof(SwtmrHandlerItem); readSize = sizeof(SwtmrHandlerItem);
for (;;) { for (;;) {
ret = LOS_QueueReadCopy(g_swtmrHandlerQueue, &swtmrHandle, &readSzie, LOS_WAIT_FOREVER); ret = LOS_QueueReadCopy(g_swtmrHandlerQueue, &swtmrHandle, &readSize, LOS_WAIT_FOREVER);
if ((ret == LOS_OK) && (readSzie == sizeof(SwtmrHandlerItem))) { if ((ret == LOS_OK) && (readSize == sizeof(SwtmrHandlerItem))) {
if (swtmrHandle.handler == NULL) { if (swtmrHandle.handler == NULL) {
continue; continue;
} }
@ -134,10 +134,10 @@ STATIC_INLINE UINT32 OsSwtmrCalcAlignCount(UINT64 currTime, UINT32 interval, UIN
VOID OsSwtmrFindAlignPos(UINT64 currTime, SWTMR_CTRL_S *swtmr) VOID OsSwtmrFindAlignPos(UINT64 currTime, SWTMR_CTRL_S *swtmr)
{ {
SWTMR_CTRL_S *minInLarge = (SWTMR_CTRL_S *)NULL; SWTMR_CTRL_S *minInLarge = (SWTMR_CTRL_S *)NULL;
SWTMR_CTRL_S *maxInLitte = (SWTMR_CTRL_S *)NULL; SWTMR_CTRL_S *maxInLittle = (SWTMR_CTRL_S *)NULL;
UINT32 currSwtmrTimes, swtmrTimes; UINT32 currSwtmrTimes, swtmrTimes;
UINT32 minInLargeVal = OS_NULL_INT; UINT32 minInLargeVal = OS_NULL_INT;
UINT32 maxInLitteval = OS_NULL_INT; UINT32 maxInLittleVal = OS_NULL_INT;
LOS_DL_LIST *listHead = &g_swtmrSortLinkList->sortLink; LOS_DL_LIST *listHead = &g_swtmrSortLinkList->sortLink;
if (LOS_ListEmpty(listHead)) { if (LOS_ListEmpty(listHead)) {
@ -175,9 +175,9 @@ VOID OsSwtmrFindAlignPos(UINT64 currTime, SWTMR_CTRL_S *swtmr)
minInLarge = cur; minInLarge = cur;
} }
} else if ((swtmrTimes < currSwtmrTimes) && ((currSwtmrTimes % swtmrTimes) == 0)) { } else if ((swtmrTimes < currSwtmrTimes) && ((currSwtmrTimes % swtmrTimes) == 0)) {
if (maxInLitteval > (currSwtmrTimes / swtmrTimes)) { if (maxInLittleVal > (currSwtmrTimes / swtmrTimes)) {
maxInLitteval = currSwtmrTimes / swtmrTimes; maxInLittleVal = currSwtmrTimes / swtmrTimes;
maxInLitte = cur; maxInLittle = cur;
} }
} }
CONTINUE_NEXT_NODE: CONTINUE_NEXT_NODE:
@ -186,8 +186,8 @@ CONTINUE_NEXT_NODE:
if (minInLarge != NULL) { if (minInLarge != NULL) {
swtmr->uwCount = OsSwtmrCalcAlignCount(currTime, swtmr->uwInterval, minInLarge->usTimerID); swtmr->uwCount = OsSwtmrCalcAlignCount(currTime, swtmr->uwInterval, minInLarge->usTimerID);
} else if (maxInLitte != NULL) { } else if (maxInLittle != NULL) {
swtmr->uwCount = OsSortLinkGetTargetExpireTime(currTime, &maxInLitte->stSortList); swtmr->uwCount = OsSortLinkGetTargetExpireTime(currTime, &maxInLittle->stSortList);
} }
return; return;

2
testsuits/sample/kernel/queue/It_los_queue_head_019.c
View File

@ -47,7 +47,7 @@ static UINT32 Testcase(VOID)
ret = LOS_QueueRead(g_testQueueID01, &buff2, QUEUE_BASE_MSGSIZE, 0); ret = LOS_QueueRead(g_testQueueID01, &buff2, QUEUE_BASE_MSGSIZE, 0);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
for (index = 0; index < 7; index++) { // 7, buffer szie for (index = 0; index < 7; index++) { // 7, buffer size
ICUNIT_GOTO_EQUAL(*((char *)(intptr_t)buff2 + index), buff1[index], ICUNIT_GOTO_EQUAL(*((char *)(intptr_t)buff2 + index), buff1[index],
*((char *)(intptr_t)buff2 + index), EXIT); *((char *)(intptr_t)buff2 + index), EXIT);
} }