From 6a24f95f53578a4605480de03e5c68106611eefc Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 21 Jul 2013 13:33:06 +0000
Subject: git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6021
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/include/chvt.h | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

(limited to 'os/kernel/include')

diff --git a/os/kernel/include/chvt.h b/os/kernel/include/chvt.h
index e88d03d15..222b3c843 100644
--- a/os/kernel/include/chvt.h
+++ b/os/kernel/include/chvt.h
@@ -66,8 +66,17 @@ typedef struct {
                                                 list.                       */
   virtual_timer_t       *vt_prev;   /**< @brief Last timer in the delta
                                                 list.                       */
-  systime_t             vt_time;    /**< @brief Must be initialized to -1.  */
+  systime_t             vt_delta;   /**< @brief Must be initialized to -1.  */
+#if CH_CFG_TIMEDELTA == 0 || defined(__DOXYGEN__)
   volatile systime_t    vt_systime; /**< @brief System Time counter.        */
+#endif
+#if CH_CFG_TIMEDELTA > 0 || defined(__DOXYGEN__)
+  /**
+   * @brief   System time of the last tick event.
+   */
+  systime_t             vt_lasttime;/**< @brief System time of the last
+                                                tick event.                 */
+#endif
 } virtual_timers_list_t;
 
 /**
@@ -78,7 +87,7 @@ typedef struct {
 struct virtual_timer {
   virtual_timer_t       *vt_next;   /**< @brief Next timer in the list.     */
   virtual_timer_t       *vt_prev;   /**< @brief Previous timer in the list. */
-  systime_t             vt_time;    /**< @brief Time delta before timeout.  */
+  systime_t             vt_delta;   /**< @brief Time delta before timeout.  */
   vtfunc_t              vt_func;    /**< @brief Timer callback function
                                                 pointer.                    */
   void                  *vt_par;    /**< @brief Timer callback function
@@ -190,7 +199,11 @@ static inline systime_t chVTGetSystemTimeI(void) {
 
   chDbgCheckClassI();
 
+#if CH_CFG_TIMEDELTA == 0
   return vtlist.vt_systime;
+#else /* CH_CFG_TIMEDELTA > 0 */
+  return port_timer_get_time();
+#endif /* CH_CFG_TIMEDELTA > 0 */
 }
 
 /**
@@ -352,12 +365,28 @@ static inline void chVTDoTickI(void) {
 
   chDbgCheckClassI();
 
+#if CH_CFG_TIMEDELTA == 0
   vtlist.vt_systime++;
   if (&vtlist != (virtual_timers_list_t *)vtlist.vt_next) {
     virtual_timer_t *vtp;
 
-    --vtlist.vt_next->vt_time;
-    while (!(vtp = vtlist.vt_next)->vt_time) {
+    --vtlist.vt_next->vt_delta;
+    while (!(vtp = vtlist.vt_next)->vt_delta) {
+      vtfunc_t fn = vtp->vt_func;
+      vtp->vt_func = (vtfunc_t)NULL;
+      vtp->vt_next->vt_prev = (void *)&vtlist;
+      vtlist.vt_next = vtp->vt_next;
+      chSysUnlockFromIsr();
+      fn(vtp->vt_par);
+      chSysLockFromIsr();
+    }
+  }
+#else /* CH_CFG_TIMEDELTA > 0 */
+  if (&vtlist != (virtual_timers_list_t *)vtlist.vt_next) {
+    virtual_timer_t *vtp;
+
+    --vtlist.vt_next->vt_delta;
+    while (!(vtp = vtlist.vt_next)->vt_delta) {
       vtfunc_t fn = vtp->vt_func;
       vtp->vt_func = (vtfunc_t)NULL;
       vtp->vt_next->vt_prev = (void *)&vtlist;
@@ -367,6 +396,7 @@ static inline void chVTDoTickI(void) {
       chSysLockFromIsr();
     }
   }
+#endif /* CH_CFG_TIMEDELTA > 0 */
 }
 
 #endif /* _CHVT_H_ */
-- 
cgit v1.2.3