git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@53 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 5 insertions, 3 deletions

diff --git a/src/chdelta.c b/src/chdelta.c
index 8a8100e5f..16dfac5bc 100644
--- a/src/chdelta.c
+++ b/src/chdelta.c
@@ -40,7 +40,9 @@ void chVTInit(void) {
  * Enables a virtual timer.

  * @param vtp the \p VirtualTimer structure pointer

  * @param time the number of time ticks, the value zero is allowed with

- *             meaning "infinite".

+ *             meaning "infinite". In this case the structure is initialized

+ *             but not inserted in the delta list, the timer will never be

+ *             triggered.

  * @param vtfunc the timer callback function. After invoking the callback

  *               the timer is disabled and the structure can be disposed or

  *               reused.

@@ -51,8 +53,8 @@ void chVTInit(void) {
 void chVTSetI(VirtualTimer *vtp, t_time time, t_vtfunc vtfunc, void *par) {

 

   vtp->vt_par = par;

+  vtp->vt_func = vtfunc;

   if (time) {

-    vtp->vt_func = vtfunc;

     VirtualTimer *p = dlist.dl_next;

     while (p->vt_dtime < time) {

       time -= p->vt_dtime;

@@ -66,7 +68,7 @@ void chVTSetI(VirtualTimer *vtp, t_time time, t_vtfunc vtfunc, void *par) {
       p->vt_dtime -= time;

   }

   else

-    vtp->vt_func = NULL;

+    vtp->vt_next = vtp->vt_prev = vtp; // Allows a chVTResetI() on the fake timer.

 }

 

 /**