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

3 files changed, 5 insertions, 5 deletions

diff --git a/src/include/sys.h b/src/include/sys.h
index ae38a5639..0c58a9c8e 100644
--- a/src/include/sys.h
+++ b/src/include/sys.h
@@ -57,7 +57,7 @@
  *       interrupts or be exactly equivalent to @p chSysDisable().

  * @note Do not invoke this API from within a kernel lock.

  */

-#define chSysDisableAll() sys_disable_all()

+#define chSysDisable() sys_disable()

 

 /**

  * Raises the system interrupt priority mask to system level.

@@ -69,7 +69,7 @@
  * @note This API is no replacement for @p chSysLock(), the @p chSysLock()

  *       could do more than just disable the interrupts.

  */

-#define chSysDisable() sys_disable()

+#define chSysSuspend() sys_suspend()

 

 /**

  * Lowers the system interrupt priority mask to user level.

diff --git a/src/templates/chcore.c b/src/templates/chcore.c
index 84f0b7418..677c4ea2f 100644
--- a/src/templates/chcore.c
+++ b/src/templates/chcore.c
@@ -72,13 +72,13 @@ void sys_unlock_from_isr(void) {
  * Disables all the interrupt sources.

  * @note Of course non maskable interrupt sources are not included.
  */

-void sys_disable_all() {

+void sys_disable() {

 }

 

 /**

  * Disables the interrupt sources that are not supposed to preempt the kernel.
  */

-void sys_disable(void) {

+void sys_suspend(void) {

 }

 

 /**

diff --git a/src/templates/chcore.h b/src/templates/chcore.h
index dec2deee7..92852fead 100644
--- a/src/templates/chcore.h
+++ b/src/templates/chcore.h
@@ -130,8 +130,8 @@ typedef struct {
 extern "C" {

 #endif

   void sys_init(void);

-  void sys_disable_all(void);

   void sys_disable(void);

+  void sys_suspend(void);

   void sys_enable(void);

   void sys_lock(void);

   void sys_unlock(void);