From 0e436b1cb6c0dea2280b09208a43af636a29ce64 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 11 Sep 2013 12:00:01 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6291 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/nil/src/nil.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'os/nil/src') diff --git a/os/nil/src/nil.c b/os/nil/src/nil.c index aefe4ccb2..4d84d654c 100644 --- a/os/nil/src/nil.c +++ b/os/nil/src/nil.c @@ -147,7 +147,7 @@ void chSysHalt(const char *reason) { */ void chSysTimerHandlerI(void) { -#if NIL_CFG_TIMEDELTA == 0 +#if NIL_CFG_ST_TIMEDELTA == 0 thread_t *tp = &nil.threads[0]; nil.systime++; do { @@ -335,14 +335,14 @@ msg_t chSchGoSleepTimeoutS(tstate_t newstate, systime_t timeout) { /* Storing the wait object for the current thread.*/ otp->state = newstate; -#if NIL_CFG_TIMEDELTA > 0 +#if NIL_CFG_ST_TIMEDELTA > 0 if (timeout != TIME_INFINITE) { systime_t time = chVTGetSystemTimeX() + timeout; /* TIMEDELTA makes sure to have enough time to reprogram the timer before the free-running timer counter reaches the selected timeout.*/ - if (timeout < NIL_CFG_TIMEDELTA) - timeout = NIL_CFG_TIMEDELTA; + if (timeout < NIL_CFG_ST_TIMEDELTA) + timeout = NIL_CFG_ST_TIMEDELTA; if (nil.lasttime == nil.nexttime) { /* Special case, first thread asking for a timeout.*/ -- cgit v1.2.3