From 9c3a6901f1b305656ebcb5cf7e4349015e363887 Mon Sep 17 00:00:00 2001 From: lurix Date: Mon, 13 Sep 2021 10:56:43 +0000 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E5=AF=BC=E8=87=B4=E7=9A=84=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lurix --- kernel/src/los_queue.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/src/los_queue.c b/kernel/src/los_queue.c index 6627a05c..b35e7838 100644 --- a/kernel/src/los_queue.c +++ b/kernel/src/los_queue.c @@ -512,7 +512,6 @@ END: *****************************************************************************/ LITE_OS_SEC_TEXT UINT32 OsQueueMailFree(UINT32 queueID, VOID *mailPool, VOID *mailMem) { - VOID *mem = (VOID *)NULL; UINT32 intSave; LosQueueCB *queueCB = (LosQueueCB *)NULL; LosTaskCB *resumedTask = (LosTaskCB *)NULL; @@ -534,14 +533,13 @@ LITE_OS_SEC_TEXT UINT32 OsQueueMailFree(UINT32 queueID, VOID *mailPool, VOID *ma if (!LOS_ListEmpty(&queueCB->memList)) { resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&queueCB->memList)); - OsSchedTaskWake(resumedTask); /* When enters the current branch, means the resumed task already can get a available membox, * so the resumedTask->msg can not be NULL. */ resumedTask->msg = mailMem; + OsSchedTaskWake(resumedTask); LOS_IntRestore(intSave); LOS_Schedule(); - } else { /* No task waiting for the mailMem, * so free it. @@ -637,7 +635,6 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_QueueInfoGet(UINT32 queueID, QUEUE_INFO_S *que intSave = LOS_IntLock(); queueCB = (LosQueueCB *)GET_QUEUE_HANDLE(queueID); - if (queueCB->queueState == OS_QUEUE_UNUSED) { ret = LOS_ERRNO_QUEUE_NOT_CREATE; goto QUEUE_END; @@ -652,15 +649,18 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_QueueInfoGet(UINT32 queueID, QUEUE_INFO_S *que queueInfo->writableCnt = queueCB->readWriteableCnt[OS_QUEUE_WRITE]; LOS_DL_LIST_FOR_EACH_ENTRY(tskCB, &queueCB->readWriteList[OS_QUEUE_READ], LosTaskCB, pendList) { - queueInfo->waitReadTask[OS_WAIT_TASK_ID_TO_ARRAY_IDX(tskCB->taskID)] |= (1 << (tskCB->taskID & OS_WAIT_TASK_ARRAY_ELEMENT_MASK)); + queueInfo->waitReadTask[OS_WAIT_TASK_ID_TO_ARRAY_IDX(tskCB->taskID)] |= + (1 << (tskCB->taskID & OS_WAIT_TASK_ARRAY_ELEMENT_MASK)); } LOS_DL_LIST_FOR_EACH_ENTRY(tskCB, &queueCB->readWriteList[OS_QUEUE_WRITE], LosTaskCB, pendList) { - queueInfo->waitWriteTask[OS_WAIT_TASK_ID_TO_ARRAY_IDX(tskCB->taskID)] |= (1 << (tskCB->taskID & OS_WAIT_TASK_ARRAY_ELEMENT_MASK)); + queueInfo->waitWriteTask[OS_WAIT_TASK_ID_TO_ARRAY_IDX(tskCB->taskID)] |= + (1 << (tskCB->taskID & OS_WAIT_TASK_ARRAY_ELEMENT_MASK)); } LOS_DL_LIST_FOR_EACH_ENTRY(tskCB, &queueCB->memList, LosTaskCB, pendList) { - queueInfo->waitMemTask[OS_WAIT_TASK_ID_TO_ARRAY_IDX(tskCB->taskID)] |= (1 << (tskCB->taskID & OS_WAIT_TASK_ARRAY_ELEMENT_MASK)); + queueInfo->waitMemTask[OS_WAIT_TASK_ID_TO_ARRAY_IDX(tskCB->taskID)] |= + (1 << (tskCB->taskID & OS_WAIT_TASK_ARRAY_ELEMENT_MASK)); } QUEUE_END: