Merge branch 'master' into dev-4.0.x

This commit is contained in:
Bernard Xiong
2018-11-20 23:13:45 +08:00
committed by GitHub
867 changed files with 264780 additions and 63524 deletions
+2 -1
View File
@@ -100,7 +100,8 @@ rt_tick_t rt_timer_next_timeout_tick(void);
void rt_timer_check(void);
#ifdef RT_USING_HOOK
void rt_timer_timeout_sethook(void (*hook)(struct rt_timer *timer));
void rt_timer_enter_sethook(void (*hook)(struct rt_timer *timer));
void rt_timer_exit_sethook(void (*hook)(struct rt_timer *timer));
#endif
/**@}*/