From e2365fc47b34c954f99dd466b6253629d7a31a1d Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 5 Nov 2017 08:50:54 +0000 Subject: Fixed a comments and added an extra check. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10953 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/rt/src/chvt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'os/rt') diff --git a/os/rt/src/chvt.c b/os/rt/src/chvt.c index 0667bf7c3..ebf528f94 100644 --- a/os/rt/src/chvt.c +++ b/os/rt/src/chvt.c @@ -178,6 +178,9 @@ void chVTDoSetI(virtual_timer_t *vtp, sysinterval_t delay, /* The delta list is scanned in order to find the correct position for this timer. */ while (p->delta < delta) { + /* Debug assert if the timer is already in the list.*/ + chDbgAssert(p != vtp, "timer already armed"); + delta -= p->delta; p = p->next; } @@ -187,11 +190,13 @@ void chVTDoSetI(virtual_timer_t *vtp, sysinterval_t delay, vtp->prev = vtp->next->prev; vtp->prev->next = vtp; p->prev = vtp; - vtp->delta = delta + vtp->delta = delta; - /* Special case when the timer is in last position in the list, the - value in the header must be restored.*/; + /* Calculate new delta for the following entry.*/ p->delta -= delta; + + /* Special case when the timer is in last position in the list, the + value in the header must be restored.*/ ch.vtlist.delta = (sysinterval_t)-1; } -- cgit v1.2.3