aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2019-06-16 12:23:00 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2019-06-16 12:23:00 +0000
commit7e7c7d4cea1abf1c0e606b4507cbdb81f968a39e (patch)
tree4b18ec6014bd1be0890d36041ae56bef81c27ca5
parentd6fa47c7fdda2f4d616deb30a168d041bcb58947 (diff)
downloadChibiOS-7e7c7d4cea1abf1c0e606b4507cbdb81f968a39e.tar.gz
ChibiOS-7e7c7d4cea1abf1c0e606b4507cbdb81f968a39e.tar.bz2
ChibiOS-7e7c7d4cea1abf1c0e606b4507cbdb81f968a39e.zip
More bug #1031.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_19.1.x@12839 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
-rw-r--r--os/rt/include/chvt.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/os/rt/include/chvt.h b/os/rt/include/chvt.h
index f1bb4d9f2..ca3b8bf44 100644
--- a/os/rt/include/chvt.h
+++ b/os/rt/include/chvt.h
@@ -218,10 +218,8 @@ static inline bool chVTGetTimersStateI(sysinterval_t *timep) {
#if CH_CFG_ST_TIMEDELTA == 0
*timep = ch.vtlist.next->delta;
#else
- *timep = chTimeDiffX(chVTGetSystemTimeX(),
- chTimeAddX(ch.vtlist.lasttime,
- ch.vtlist.next->delta +
- (sysinterval_t)CH_CFG_ST_TIMEDELTA));
+ *timep = (ch.vtlist.next->delta + (sysinterval_t)CH_CFG_ST_TIMEDELTA) -
+ chTimeDiffX(ch.vtlist.lasttime, chVTGetSystemTimeX());
#endif
}
@@ -423,7 +421,7 @@ static inline void chVTDoTickI(void) {
fn = vtp->func;
vtp->func = NULL;
- /* if the list becomes empty then the timer is stopped.*/
+ /* If the list becomes empty then the timer is stopped.*/
if (ch.vtlist.next == (virtual_timer_t *)&ch.vtlist) {
port_timer_stop_alarm();
}
@@ -439,7 +437,7 @@ static inline void chVTDoTickI(void) {
while (vtp->delta <= nowdelta);
}
- /* if the list is empty, nothing else to do.*/
+ /* If the list is empty, nothing else to do.*/
if (ch.vtlist.next == (virtual_timer_t *)&ch.vtlist) {
return;
}