libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'RT-Thread/master'

This commit is contained in:
Wenlong.Fan 2019-03-28 16:01:06 +08:00
parent 7db820fb0a 437b0da91e
commit fb27e8222c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/clock.c
View File

@ -112,13 +112,13 @@ rt_tick_t rt_tick_from_millisecond(rt_int32_t ms)
rt_tick_t tick; rt_tick_t tick;
if (ms < 0) if (ms < 0)
{ {
tick = RT_WAITING_FOREVER; tick = (rt_tick_t)RT_WAITING_FOREVER;
} }
else else
{ {
tick = RT_TICK_PER_SECOND * (ms / 1000); tick = RT_TICK_PER_SECOND * (ms / 1000);
tick += (RT_TICK_PER_SECOND * (ms%1000) + 999) / 1000; tick += (RT_TICK_PER_SECOND * (ms % 1000) + 999) / 1000;
} }
/* return the calculated tick */ /* return the calculated tick */