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

!597 修复未使用的参数和类型比较编译报错问题 

Merge pull request !597 from 方烨/develop
This commit is contained in:
openharmony_ci 2022-02-16 06:42:11 +00:00 committed by Gitee
parent 35971d660e 21b46e82f3
commit 7cf08722a0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/signal/los_signal.c
View File

@ -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;

1
kal/cmsis/cmsis_liteos2.c
View File

@ -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;
}

16
kal/posix/src/semaphore.c
View File

@ -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;
}

2
kernel/src/los_sched.c
View File

@ -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;