From 0e436b1cb6c0dea2280b09208a43af636a29ce64 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
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/include/nil.h          | 14 +++++++-------
 os/nil/osal/osal.h            |  2 +-
 os/nil/ports/ARMCMx/nilcore.h |  2 +-
 os/nil/src/nil.c              |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'os')

diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h
index 1c8aaf359..98dd2c04e 100644
--- a/os/nil/include/nil.h
+++ b/os/nil/include/nil.h
@@ -142,8 +142,8 @@ typedef struct nil_thread thread_t;
  *          The value one is not valid, timeouts are rounded up to
  *          this value.
  */
-#if !defined(NIL_CFG_TIMEDELTA) || defined(__DOXYGEN__)
-#define NIL_CFG_TIMEDELTA                   0
+#if !defined(NIL_CFG_ST_TIMEDELTA) || defined(__DOXYGEN__)
+#define NIL_CFG_ST_TIMEDELTA                0
 #endif
 
 /**
@@ -195,8 +195,8 @@ typedef struct nil_thread thread_t;
 #error "invalid NIL_CFG_ST_FREQUENCY specified"
 #endif
 
-#if (NIL_CFG_TIMEDELTA < 0) || (NIL_CFG_TIMEDELTA == 1)
-#error "invalid NIL_CFG_TIMEDELTA specified"
+#if (NIL_CFG_ST_TIMEDELTA < 0) || (NIL_CFG_ST_TIMEDELTA == 1)
+#error "invalid NIL_CFG_ST_TIMEDELTA specified"
 #endif
 
 #if NIL_CFG_ENABLE_ASSERTS
@@ -309,13 +309,13 @@ typedef struct {
    *          or to an higher priority thread if a switch is required.
    */
   thread_t              *next;
-#if NIL_CFG_TIMEDELTA == 0 || defined(__DOXYGEN__)
+#if NIL_CFG_ST_TIMEDELTA == 0 || defined(__DOXYGEN__)
   /**
    * @brief   System time.
    */
   systime_t             systime;
 #endif
-#if NIL_CFG_TIMEDELTA > 0 || defined(__DOXYGEN__)
+#if NIL_CFG_ST_TIMEDELTA > 0 || defined(__DOXYGEN__)
   /**
    * @brief   System time of the last tick event.
    */
@@ -702,7 +702,7 @@ typedef struct {
  *
  * @xclass
  */
-#if NIL_CFG_TIMEDELTA == 0 || defined(__DOXYGEN__)
+#if NIL_CFG_ST_TIMEDELTA == 0 || defined(__DOXYGEN__)
 #define chVTGetSystemTimeX() (nil.systime)
 #else
 #define chVTGetSystemTimeX() port_timer_get_time()
diff --git a/os/nil/osal/osal.h b/os/nil/osal/osal.h
index d4394687e..71d47894f 100644
--- a/os/nil/osal/osal.h
+++ b/os/nil/osal/osal.h
@@ -88,7 +88,7 @@
 /**
  * @brief   Systick mode required by the underlying OS.
  */
-#if (NIL_CFG_TIMEDELTA == 0) || defined(__DOXYGEN__)
+#if (NIL_CFG_ST_TIMEDELTA == 0) || defined(__DOXYGEN__)
 #define OSAL_ST_MODE                        OSAL_ST_MODE_PERIODIC
 #else
 #define OSAL_ST_MODE                        OSAL_ST_MODE_FREERUNNING
diff --git a/os/nil/ports/ARMCMx/nilcore.h b/os/nil/ports/ARMCMx/nilcore.h
index a4d032b95..85e004dca 100644
--- a/os/nil/ports/ARMCMx/nilcore.h
+++ b/os/nil/ports/ARMCMx/nilcore.h
@@ -197,7 +197,7 @@ struct port_intctx {};
 #endif
 
 #if !defined(_FROM_ASM_)
-#if NIL_CFG_TIMEDELTA > 0
+#if NIL_CFG_ST_TIMEDELTA > 0
 #include "nilcore_timer.h"
 #endif
 #endif /* !defined(_FROM_ASM_) */
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