p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix:fix queuePosition typo

This commit is contained in:
kenneth 2021-05-19 14:05:28 +08:00
parent a68295d2a9
commit 2b643b04c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/base/ipc/los_queue.c
View File

@ -193,20 +193,20 @@ STATIC VOID OsQueueBufferOperate(LosQueueCB *queueCB, UINT32 operateType, VOID *
{ {
UINT8 *queueNode = NULL; UINT8 *queueNode = NULL;
UINT32 msgDataSize; UINT32 msgDataSize;
UINT16 queuequeuePosition; UINT16 queuePosition;
/* get the queue position */ /* get the queue position */
switch (OS_QUEUE_OPERATE_GET(operateType)) { switch (OS_QUEUE_OPERATE_GET(operateType)) {
case OS_QUEUE_READ_HEAD: case OS_QUEUE_READ_HEAD:
queuequeuePosition = queueCB->queueHead; queuePosition = queueCB->queueHead;
((queueCB->queueHead + 1) == queueCB->queueLen) ? (queueCB->queueHead = 0) : (queueCB->queueHead++); ((queueCB->queueHead + 1) == queueCB->queueLen) ? (queueCB->queueHead = 0) : (queueCB->queueHead++);
break; break;
case OS_QUEUE_WRITE_HEAD: case OS_QUEUE_WRITE_HEAD:
(queueCB->queueHead == 0) ? (queueCB->queueHead = queueCB->queueLen - 1) : (--queueCB->queueHead); (queueCB->queueHead == 0) ? (queueCB->queueHead = queueCB->queueLen - 1) : (--queueCB->queueHead);
queuequeuePosition = queueCB->queueHead; queuePosition = queueCB->queueHead;
break; break;
case OS_QUEUE_WRITE_TAIL: case OS_QUEUE_WRITE_TAIL:
queuequeuePosition = queueCB->queueTail; queuePosition = queueCB->queueTail;
((queueCB->queueTail + 1) == queueCB->queueLen) ? (queueCB->queueTail = 0) : (queueCB->queueTail++); ((queueCB->queueTail + 1) == queueCB->queueLen) ? (queueCB->queueTail = 0) : (queueCB->queueTail++);
break; break;
default: /* read tail, reserved. */ default: /* read tail, reserved. */
@ -214,7 +214,7 @@ STATIC VOID OsQueueBufferOperate(LosQueueCB *queueCB, UINT32 operateType, VOID *
return; return;
} }
queueNode = &(queueCB->queueHandle[(queuequeuePosition * (queueCB->queueSize))]); queueNode = &(queueCB->queueHandle[(queuePosition * (queueCB->queueSize))]);
if (OS_QUEUE_IS_READ(operateType)) { if (OS_QUEUE_IS_READ(operateType)) {
if (memcpy_s(&msgDataSize, sizeof(UINT32), queueNode + queueCB->queueSize - sizeof(UINT32), if (memcpy_s(&msgDataSize, sizeof(UINT32), queueNode + queueCB->queueSize - sizeof(UINT32),