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 pull request #2480 from HubertXie/master 

【修复】修复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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rtthread.h
View File

@ -75,7 +75,7 @@ void rt_system_tick_init(void);
rt_tick_t rt_tick_get(void); rt_tick_t rt_tick_get(void);
void rt_tick_set(rt_tick_t tick); void rt_tick_set(rt_tick_t tick);
void rt_tick_increase(void); 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_init(void);
void rt_system_timer_thread_init(void); void rt_system_timer_thread_init(void);

11
src/clock.c
View File

@ -107,14 +107,19 @@ void rt_tick_increase(void)
* *
* @return the calculated tick * @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) if (ms < 0)
{
tick = RT_WAITING_FOREVER; tick = RT_WAITING_FOREVER;
}
else 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 the calculated tick */
return tick; return tick;