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/src | |
| 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/src')
| -rw-r--r-- | os/rt/src/chvt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/os/rt/src/chvt.c b/os/rt/src/chvt.c index cc042d7c0..6139abd53 100644 --- a/os/rt/src/chvt.c +++ b/os/rt/src/chvt.c @@ -63,11 +63,11 @@ void _vt_init(void) { ch.vtlist.vt_next = ch.vtlist.vt_prev = (void *)&ch.vtlist;
ch.vtlist.vt_delta = (systime_t)-1;
-#if CH_CFG_TIMEDELTA == 0
+#if CH_CFG_ST_TIMEDELTA == 0
ch.vtlist.vt_systime = 0;
-#else /* CH_CFG_TIMEDELTA > 0 */
+#else /* CH_CFG_ST_TIMEDELTA > 0 */
ch.vtlist.vt_lasttime = 0;
-#endif /* CH_CFG_TIMEDELTA > 0 */
+#endif /* CH_CFG_ST_TIMEDELTA > 0 */
}
/**
@@ -123,14 +123,14 @@ void chVTDoSetI(virtual_timer_t *vtp, systime_t delay, vtp->vt_func = vtfunc;
p = ch.vtlist.vt_next;
-#if CH_CFG_TIMEDELTA > 0 || defined(__DOXYGEN__)
+#if CH_CFG_ST_TIMEDELTA > 0 || defined(__DOXYGEN__)
{
systime_t now = port_timer_get_time();
/* If the requested delay is lower than the minimum safe delta then it
is raised to the minimum safe value.*/
- if (delay < CH_CFG_TIMEDELTA)
- delay = CH_CFG_TIMEDELTA;
+ if (delay < CH_CFG_ST_TIMEDELTA)
+ delay = CH_CFG_ST_TIMEDELTA;
if (&ch.vtlist == (virtual_timers_list_t *)p) {
/* The delta list is empty, the current time becomes the new
@@ -149,7 +149,7 @@ void chVTDoSetI(virtual_timer_t *vtp, systime_t delay, port_timer_set_alarm(ch.vtlist.vt_lasttime + delay);
}
}
-#endif /* CH_CFG_TIMEDELTA > 0 */
+#endif /* CH_CFG_ST_TIMEDELTA > 0 */
/* The delta list is scanned in order to find the correct position for
this timer. */
@@ -192,7 +192,7 @@ void chVTDoResetI(virtual_timer_t *vtp) { is the last of the list, restoring it.*/
ch.vtlist.vt_delta = (systime_t)-1;
-#if CH_CFG_TIMEDELTA > 0 || defined(__DOXYGEN__)
+#if CH_CFG_ST_TIMEDELTA > 0 || defined(__DOXYGEN__)
{
if (&ch.vtlist == (virtual_timers_list_t *)ch.vtlist.vt_next) {
/* Just removed the last element in the list, alarm timer stopped.*/
@@ -204,7 +204,7 @@ void chVTDoResetI(virtual_timer_t *vtp) { ch.vtlist.vt_next->vt_delta);
}
}
-#endif /* CH_CFG_TIMEDELTA > 0 */
+#endif /* CH_CFG_ST_TIMEDELTA > 0 */
}
/** @} */
|