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

fix:Change the interface to LOS_UDelay and change the input parameter to microsecond. 

Close #I3NT3Y

Change-Id: Iae33e0aff59480342b07bb4fd2e66969a09affb3
This commit is contained in:
zhushengle 2021-04-23 17:33:27 +08:00
parent 9656d852ab
commit adaf6cf7c5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kal/cmsis/cmsis_liteos2.c
View File

@ -639,7 +639,7 @@ osStatus_t osDelay(uint32_t ticks)
return osOK; return osOK;
} }
if (osKernelGetState() != osKernelRunning) { if (osKernelGetState() != osKernelRunning) {
LOS_SysDelay(ticks); LOS_UDelay(ticks * OS_US_PER_TICK);
} else { } else {
uwRet = LOS_TaskDelay(ticks); uwRet = LOS_TaskDelay(ticks);
} }

4
kernel/arch/include/los_timer.h
View File

@ -67,9 +67,7 @@ VOID HalClearSysSleepFlag(VOID);
VOID HalEnterSleep(LOS_SysSleepEnum sleep); VOID HalEnterSleep(LOS_SysSleepEnum sleep);
VOID HalDelay(UINT32 ticks); /**
/**
* @ingroup los_timer * @ingroup los_timer
* @brief Get systick cycle. * @brief Get systick cycle.
* *

4
kernel/include/los_task.h
View File

@ -1098,14 +1098,14 @@ extern CHAR* LOS_TaskNameGet(UINT32 taskID);
* @attention: * @attention:
* <ul><li>None.</li></ul> * <ul><li>None.</li></ul>
* *
* @param ticks [IN] delay times. * @param UINT64 [IN] delay times, microseconds.
* *
* @retval: None. * @retval: None.
* @par Dependency: * @par Dependency:
* <ul><li>los_task.h: the header file that contains the API declaration.</li></ul> * <ul><li>los_task.h: the header file that contains the API declaration.</li></ul>
* @see None. * @see None.
*/ */
extern VOID LOS_SysDelay(UINT32 ticks); extern VOID LOS_UDelay(UINT64 microseconds);
/** /**
* @ingroup los_cpup * @ingroup los_cpup

8
kernel/src/los_task.c
View File

@ -1296,15 +1296,17 @@ LITE_OS_SEC_TEXT_MINOR VOID LOS_Msleep(UINT32 mSecs)
(VOID)LOS_TaskDelay(interval); (VOID)LOS_TaskDelay(interval);
} }
VOID LOS_SysDelay(UINT32 ticks) VOID LOS_UDelay(UINT64 microseconds)
{ {
UINT64 endTime; UINT64 endTime;
if (ticks == 0) { if (microseconds == 0) {
return; return;
} }
endTime = LOS_SysCycleGet() + ticks * OS_CYCLE_PER_TICK; endTime = (microseconds / OS_SYS_US_PER_SECOND) * OS_SYS_CLOCK +
(microseconds % OS_SYS_US_PER_SECOND) * OS_SYS_CLOCK / OS_SYS_US_PER_SECOND;
endTime = LOS_SysCycleGet() + endTime;
while (LOS_SysCycleGet() < endTime) { while (LOS_SysCycleGet() < endTime) {
} }