aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-08-06 09:24:30 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-08-06 09:24:30 +0000
commitec7cf10fcdaf32a56624f408be5830e4d5a0eef2 (patch)
tree1500a52c746158fb4459237c5c920c7f1ea78c10
parent04601b760b4d72a400237c5469a0962a66251507 (diff)
downloadChibiOS-ec7cf10fcdaf32a56624f408be5830e4d5a0eef2.tar.gz
ChibiOS-ec7cf10fcdaf32a56624f408be5830e4d5a0eef2.tar.bz2
ChibiOS-ec7cf10fcdaf32a56624f408be5830e4d5a0eef2.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6085 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/halnew/osal/chibios/osal.h2
-rw-r--r--os/kernel/src/chsys.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/os/halnew/osal/chibios/osal.h b/os/halnew/osal/chibios/osal.h
index ca3c3f8b5..726782d8b 100644
--- a/os/halnew/osal/chibios/osal.h
+++ b/os/halnew/osal/chibios/osal.h
@@ -316,6 +316,7 @@ static inline void osalSysUnlockFromISR(void) {
chSysUnlockFromISR();
}
+#if CH_PORT_SUPPORTS_RT || defined(__DOXYGEN__)
/**
* @brief Polled delay.
* @note The real delay is always few cycles in excess of the specified
@@ -329,6 +330,7 @@ static inline void osalSysPolledDelayX(rtcnt_t cycles) {
chSysPolledDelayX(cycles);
}
+#endif
/**
* @brief Systick callback for the underlying OS.
diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c
index 7057a7e01..cd4832831 100644
--- a/os/kernel/src/chsys.c
+++ b/os/kernel/src/chsys.c
@@ -246,7 +246,6 @@ void chSysRestoreLockX(syssts_t sts) {
}
}
-
#if CH_PORT_SUPPORTS_RT || defined(__DOXYGEN__)
/**
* @brief Realtime window test.