diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-11 12:51:33 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-11 12:51:33 +0000 |
| commit | 0f341a84ecbffa235bf0d2f461181deaad92bf2f (patch) | |
| tree | 4bd7801c568d63ad50bdc4c915faa7d7d4e1f9bd /os/rt/include | |
| parent | ab736d4dfd758091ed3d6244f7170dd641739aed (diff) | |
| download | ChibiOS-0f341a84ecbffa235bf0d2f461181deaad92bf2f.tar.gz ChibiOS-0f341a84ecbffa235bf0d2f461181deaad92bf2f.tar.bz2 ChibiOS-0f341a84ecbffa235bf0d2f461181deaad92bf2f.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6293 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/include')
| -rw-r--r-- | os/rt/include/chglobal.h | 4 | ||||
| -rw-r--r-- | os/rt/include/chvt.h | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/os/rt/include/chglobal.h b/os/rt/include/chglobal.h index 9803aa8fb..3d8458f02 100644 --- a/os/rt/include/chglobal.h +++ b/os/rt/include/chglobal.h @@ -236,10 +236,10 @@ typedef struct { virtual_timer_t *vt_prev; /**< @brief Last timer in the delta
list. */
systime_t vt_delta; /**< @brief Must be initialized to -1. */
-#if CH_CFG_TIMEDELTA == 0 || defined(__DOXYGEN__)
+#if CH_CFG_ST_TIMEDELTA == 0 || defined(__DOXYGEN__)
volatile systime_t vt_systime; /**< @brief System Time counter. */
#endif
-#if CH_CFG_TIMEDELTA > 0 || defined(__DOXYGEN__)
+#if CH_CFG_ST_TIMEDELTA > 0 || defined(__DOXYGEN__)
/**
* @brief System time of the last tick event.
*/
diff --git a/os/rt/include/chvt.h b/os/rt/include/chvt.h index 447c4deee..712aff699 100644 --- a/os/rt/include/chvt.h +++ b/os/rt/include/chvt.h @@ -45,15 +45,15 @@ #error "invalid CH_CFG_ST_FREQUENCY specified"
#endif
-#if (CH_CFG_TIMEDELTA < 0) || (CH_CFG_TIMEDELTA == 1)
-#error "invalid CH_CFG_TIMEDELTA specified"
+#if (CH_CFG_ST_TIMEDELTA < 0) || (CH_CFG_ST_TIMEDELTA == 1)
+#error "invalid CH_CFG_ST_TIMEDELTA specified"
#endif
-#if (CH_CFG_TIMEDELTA > 0) && (CH_CFG_TIME_QUANTUM > 0)
+#if (CH_CFG_ST_TIMEDELTA > 0) && (CH_CFG_TIME_QUANTUM > 0)
#error "CH_CFG_TIME_QUANTUM not supported in tickless mode"
#endif
-#if (CH_CFG_TIMEDELTA > 0) && CH_DBG_THREADS_PROFILING
+#if (CH_CFG_ST_TIMEDELTA > 0) && CH_DBG_THREADS_PROFILING
#error "CH_DBG_THREADS_PROFILING not supported in tickless mode"
#endif
@@ -190,11 +190,11 @@ static inline void chVTObjectInit(virtual_timer_t *vtp) { */
static inline systime_t chVTGetSystemTimeX(void) {
-#if CH_CFG_TIMEDELTA == 0
+#if CH_CFG_ST_TIMEDELTA == 0
return ch.vtlist.vt_systime;
-#else /* CH_CFG_TIMEDELTA > 0 */
+#else /* CH_CFG_ST_TIMEDELTA > 0 */
return port_timer_get_time();
-#endif /* CH_CFG_TIMEDELTA > 0 */
+#endif /* CH_CFG_ST_TIMEDELTA > 0 */
}
/**
@@ -366,7 +366,7 @@ static inline void chVTDoTickI(void) { chDbgCheckClassI();
-#if CH_CFG_TIMEDELTA == 0
+#if CH_CFG_ST_TIMEDELTA == 0
ch.vtlist.vt_systime++;
if (&ch.vtlist != (virtual_timers_list_t *)ch.vtlist.vt_next) {
virtual_timer_t *vtp;
@@ -382,7 +382,7 @@ static inline void chVTDoTickI(void) { chSysLockFromISR();
}
}
-#else /* CH_CFG_TIMEDELTA > 0 */
+#else /* CH_CFG_ST_TIMEDELTA > 0 */
virtual_timer_t *vtp;
systime_t now = chVTGetSystemTimeX();
systime_t delta = now - ch.vtlist.vt_lasttime;
@@ -407,7 +407,7 @@ static inline void chVTDoTickI(void) { /* Updating the alarm to the next deadline.*/
port_timer_set_alarm(now + vtp->vt_delta);
}
-#endif /* CH_CFG_TIMEDELTA > 0 */
+#endif /* CH_CFG_ST_TIMEDELTA > 0 */
}
#endif /* _CHVT_H_ */
|