From 21b46e82f31030703d052369701f4d6d736a4a86 Mon Sep 17 00:00:00 2001 From: fangye Date: Tue, 15 Feb 2022 18:53:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=8F=82=E6=95=B0=E5=92=8C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=AF=94=E8=BE=83=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fangye Change-Id: I64f9e0cd20b62f877f353340b81922ddd45fbf7c --- components/signal/los_signal.c | 1 + kal/cmsis/cmsis_liteos2.c | 1 + kal/posix/src/semaphore.c | 16 ++++++++-------- kernel/src/los_sched.c | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/signal/los_signal.c b/components/signal/los_signal.c index b9d80a87..069fbc6c 100644 --- a/components/signal/los_signal.c +++ b/components/signal/los_signal.c @@ -144,6 +144,7 @@ STATIC VOID SignalHandle(LosTaskCB *task, BOOL cleanStatus) STATIC VOID SignalEntry(INT32 sigNo) { + (void)sigNo; LosTaskCB *task = OsCurrTaskGet(); OsSigCB *sigCB = (OsSigCB *)task->sig; diff --git a/kal/cmsis/cmsis_liteos2.c b/kal/cmsis/cmsis_liteos2.c index c99bf731..997e336c 100644 --- a/kal/cmsis/cmsis_liteos2.c +++ b/kal/cmsis/cmsis_liteos2.c @@ -841,6 +841,7 @@ osEventFlagsId_t osEventFlagsNew(const osEventFlagsAttr_t *attr) const char *osEventFlagsGetName(osEventFlagsId_t ef_id) { + (void)ef_id; if (OS_INT_ACTIVE) { return NULL; } diff --git a/kal/posix/src/semaphore.c b/kal/posix/src/semaphore.c index c74a4044..0400b0f5 100644 --- a/kal/posix/src/semaphore.c +++ b/kal/posix/src/semaphore.c @@ -82,8 +82,8 @@ int sem_init(sem_t *sem, int shared, unsigned int value) return -1; } - sem->s_magic = (int)_SEM_MAGIC; - sem->s_handle = (int)semHandle; + sem->s_magic = (INT32)_SEM_MAGIC; + sem->s_handle = (INT32)semHandle; return 0; } @@ -92,7 +92,7 @@ int sem_destroy(sem_t *sem) { UINT32 ret; - if ((sem == NULL) || (sem->s_magic != (int)_SEM_MAGIC)) { + if ((sem == NULL) || (sem->s_magic != (INT32)_SEM_MAGIC)) { errno = EINVAL; return -1; } @@ -110,7 +110,7 @@ int sem_wait(sem_t *sem) { UINT32 ret; - if ((sem == NULL) || (sem->s_magic != (int)_SEM_MAGIC)) { + if ((sem == NULL) || (sem->s_magic != (INT32)_SEM_MAGIC)) { errno = EINVAL; return -1; } @@ -128,7 +128,7 @@ int sem_post(sem_t *sem) { UINT32 ret; - if ((sem == NULL) || (sem->s_magic != (int)_SEM_MAGIC)) { + if ((sem == NULL) || (sem->s_magic != (INT32)_SEM_MAGIC)) { errno = EINVAL; return -1; } @@ -146,7 +146,7 @@ int sem_trywait(sem_t *sem) { UINT32 ret; - if ((sem == NULL) || (sem->s_magic != _SEM_MAGIC)) { + if ((sem == NULL) || (sem->s_magic != (INT32)_SEM_MAGIC)) { errno = EINVAL; return -1; } @@ -165,7 +165,7 @@ int sem_timedwait(sem_t *sem, const struct timespec *timeout) UINT32 ret; UINT64 tickCnt; - if ((sem == NULL) || (sem->s_magic != (int)_SEM_MAGIC)) { + if ((sem == NULL) || (sem->s_magic != (INT32)_SEM_MAGIC)) { errno = EINVAL; return -1; } @@ -193,7 +193,7 @@ int sem_getvalue(sem_t *sem, int *currVal) { UINT32 ret; - if ((sem == NULL) || (sem->s_magic != _SEM_MAGIC)|| (currVal == NULL)) { + if ((sem == NULL) || (sem->s_magic != (INT32)_SEM_MAGIC)|| (currVal == NULL)) { errno = EINVAL; return -1; } diff --git a/kernel/src/los_sched.c b/kernel/src/los_sched.c index 55580ab8..ed6a6f12 100644 --- a/kernel/src/los_sched.c +++ b/kernel/src/los_sched.c @@ -131,7 +131,7 @@ VOID OsSchedUpdateExpireTime(VOID) isPmMode = OsIsPmMode(); #endif if ((runTask->taskID != g_idleTaskID) && !isPmMode) { - INT32 timeSlice = (runTask->timeSlice <= OS_TIME_SLICE_MIN) ? OS_SCHED_TIME_SLICES : runTask->timeSlice; + INT32 timeSlice = (runTask->timeSlice <= OS_TIME_SLICE_MIN) ? (INT32)OS_SCHED_TIME_SLICES : runTask->timeSlice; endTime = runTask->startTime + timeSlice; } else { endTime = OS_SCHED_MAX_RESPONSE_TIME - OS_TICK_RESPONSE_PRECISION;