diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-09-10 10:18:02 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-09-10 10:18:02 +0000 |
| commit | 530c3a6f9e58a9b7dd2439424bde767d136cbef3 (patch) | |
| tree | 3a227e5b972fe610f15dfb7639a15869ca7b73a7 /os/rt/include/chsys.h | |
| parent | e5f3bc7f8640f4f145dfcacae49d6089d4c82a34 (diff) | |
| download | ChibiOS-530c3a6f9e58a9b7dd2439424bde767d136cbef3.tar.gz ChibiOS-530c3a6f9e58a9b7dd2439424bde767d136cbef3.tar.bz2 ChibiOS-530c3a6f9e58a9b7dd2439424bde767d136cbef3.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7254 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/include/chsys.h')
| -rw-r--r-- | os/rt/include/chsys.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/os/rt/include/chsys.h b/os/rt/include/chsys.h index 5b7355ade..4371feb87 100644 --- a/os/rt/include/chsys.h +++ b/os/rt/include/chsys.h @@ -362,26 +362,26 @@ static inline void chSysUnlockFromISR(void) { }
/**
- * @brief Conditionally enters the kernel lock state.
+ * @brief Unconditionally enters the kernel lock state.
* @note Can be called without previous knowledge of the current lock state.
* The final state is "s-locked".
*
* @special
*/
-static inline void chSysConditionalLock(void) {
+static inline void chSysUnconditionalLock(void) {
if (port_irq_enabled(port_get_irq_status()))
chSysLock();
}
/**
- * @brief Conditionally leaves the kernel lock state.
+ * @brief Unconditionally leaves the kernel lock state.
* @note Can be called without previous knowledge of the current lock state.
* The final state is "normal".
*
* @special
*/
-static inline void chSysConditionalUnlock(void) {
+static inline void chSysUnconditionalUnlock(void) {
if (!port_irq_enabled(port_get_irq_status()))
chSysUnlock();
|