git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7568 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 6 insertions, 6 deletions

diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h
index e6644f1e9..556eeceb0 100644
--- a/os/nil/include/nil.h
+++ b/os/nil/include/nil.h
@@ -835,8 +835,8 @@ extern "C" {
   void chSysInit(void);

   void chSysHalt(const char *reason);

   void chSysTimerHandlerI(void);

-  void chSysConditionalLock(void);

-  void chSysConditionalUnlock(void);

+  void chSysUnconditionalLock(void);

+  void chSysUnconditionalUnlock(void);

   syssts_t chSysGetStatusAndLockX(void);

   void chSysRestoreStatusX(syssts_t sts);

   thread_t *chSchReadyI(thread_t *tp, msg_t msg);

diff --git a/os/nil/src/nil.c b/os/nil/src/nil.c
index f5c0d99dc..402037501 100644
--- a/os/nil/src/nil.c
+++ b/os/nil/src/nil.c
@@ -220,26 +220,26 @@ void chSysTimerHandlerI(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

  */

-void chSysConditionalLock(void) {

+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

  */

-void chSysConditionalUnlock(void) {

+void chSysUnconditionalUnlock(void) {

 

   if (!port_irq_enabled(port_get_irq_status()))

     chSysUnlock();