Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-20 17:44:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2480 from HubertXie/master

Browse Source 
【修复】修复ms转tick时计算溢出问题
This commit is contained in:
Bernard Xiong
2019-03-23 06:25:27 +08:00
committed by GitHub
parent 0b3c99d650 1e16a1ef23
commit efd8b404a3
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clock.c
+9 -4
View File
@@ -107,15 +107,20 @@ void rt_tick_increase(void)
*
* @return the calculated tick
*/
int rt_tick_from_millisecond(rt_int32_t ms)
rt_tick_t rt_tick_from_millisecond(rt_int32_t ms)
{
int tick;
rt_tick_t tick;
if (ms < 0)
{
tick = RT_WAITING_FOREVER;
}
else
tick = (RT_TICK_PER_SECOND * ms + 999) / 1000;
{
tick = RT_TICK_PER_SECOND * (ms / 1000);
tick += (RT_TICK_PER_SECOND * (ms%1000) + 999) / 1000;
}
/* return the calculated tick */
return tick;
}