diff options
| -rw-r--r-- | include/rtthread.h | 2 | ||||
| -rw-r--r-- | src/clock.c | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/rtthread.h b/include/rtthread.h index e66e30fddb..955ea51c50 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -75,7 +75,7 @@ void rt_system_tick_init(void); rt_tick_t rt_tick_get(void); void rt_tick_set(rt_tick_t tick); void rt_tick_increase(void); -int rt_tick_from_millisecond(rt_int32_t ms); +rt_tick_t rt_tick_from_millisecond(rt_int32_t ms); void rt_system_timer_init(void); void rt_system_timer_thread_init(void); diff --git a/src/clock.c b/src/clock.c index 4fa73da472..5fcd1d4ae4 100644 --- a/src/clock.c +++ b/src/clock.c @@ -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; } |