Fixed bug 3387671.

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

7 files changed, 9 insertions, 6 deletions

diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.h b/os/ports/GCC/ARMCMx/chcore_v6m.h
index bb6e6083b..c2142e46a 100644
--- a/os/ports/GCC/ARMCMx/chcore_v6m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v6m.h
@@ -238,7 +238,7 @@ struct intctx {
  * @param[in] ntp       the thread to be switched in

  * @param[in] otp       the thread to be switched out

  */

-#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)

+#if !CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)

 #define port_switch(ntp, otp) _port_switch(ntp, otp)

 #else

 #define port_switch(ntp, otp) {                                             \

diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h
index afb3ac21d..5e2aea343 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.h
@@ -324,7 +324,7 @@ struct intctx {
  * @param[in] ntp       the thread to be switched in

  * @param[in] otp       the thread to be switched out

  */

-#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)

+#if !CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)

 #define port_switch(ntp, otp) _port_switch(ntp, otp)

 #else

 #define port_switch(ntp, otp) {                                             \

diff --git a/os/ports/IAR/ARMCMx/chcore_v6m.h b/os/ports/IAR/ARMCMx/chcore_v6m.h
index 3eed8bf43..a25fde1ef 100644
--- a/os/ports/IAR/ARMCMx/chcore_v6m.h
+++ b/os/ports/IAR/ARMCMx/chcore_v6m.h
@@ -236,7 +236,7 @@ struct intctx {
  * @param[in] ntp       the thread to be switched in

  * @param[in] otp       the thread to be switched out

  */

-#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)

+#if !CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)

 #define port_switch(ntp, otp) _port_switch(ntp, otp)

 #else

 #define port_switch(ntp, otp) {                                             \

diff --git a/os/ports/IAR/ARMCMx/chcore_v7m.h b/os/ports/IAR/ARMCMx/chcore_v7m.h
index ac757a563..059f29711 100644
--- a/os/ports/IAR/ARMCMx/chcore_v7m.h
+++ b/os/ports/IAR/ARMCMx/chcore_v7m.h
@@ -302,7 +302,7 @@ struct intctx {
  * @param[in] ntp       the thread to be switched in

  * @param[in] otp       the thread to be switched out

  */

-#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)

+#if !CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)

 #define port_switch(ntp, otp) _port_switch(ntp, otp)

 #else

 #define port_switch(ntp, otp) {                                             \

diff --git a/os/ports/RVCT/ARMCMx/chcore_v6m.h b/os/ports/RVCT/ARMCMx/chcore_v6m.h
index 347588bbb..7241d462f 100644
--- a/os/ports/RVCT/ARMCMx/chcore_v6m.h
+++ b/os/ports/RVCT/ARMCMx/chcore_v6m.h
@@ -236,7 +236,7 @@ struct intctx {
  * @param[in] ntp       the thread to be switched in

  * @param[in] otp       the thread to be switched out

  */

-#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)

+#if !CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)

 #define port_switch(ntp, otp) _port_switch(ntp, otp)

 #else

 #define port_switch(ntp, otp) {                                             \

diff --git a/os/ports/RVCT/ARMCMx/chcore_v7m.h b/os/ports/RVCT/ARMCMx/chcore_v7m.h
index 14b25fd8c..fdf855f77 100644
--- a/os/ports/RVCT/ARMCMx/chcore_v7m.h
+++ b/os/ports/RVCT/ARMCMx/chcore_v7m.h
@@ -234,6 +234,7 @@ struct intctx {
 /**

  * @brief   Kernel-lock action from an interrupt handler.

  * @details This function is invoked before invoking I-class APIs from

+

  *          interrupt handlers. The implementation is architecture dependent,

  *          in its simplest form it is void.

  * @note    Same as @p port_lock() in this port.

@@ -309,7 +310,7 @@ struct intctx {
  * @param[in] ntp       the thread to be switched in

  * @param[in] otp       the thread to be switched out

  */

-#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)

+#if !CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)

 #define port_switch(ntp, otp) _port_switch(ntp, otp)

 #else

 #define port_switch(ntp, otp) {                                             \

diff --git a/readme.txt b/readme.txt
index 8a8bbac1b..149551b26 100644
--- a/readme.txt
+++ b/readme.txt
@@ -73,6 +73,8 @@
 *****************************************************************************

 

 *** 2.3.3 ***

+- FIX: Fixed wrong check on CH_DBG_ENABLE_STACK_CHECK setting (bug 3387671)

+  (backported to 2.2.7).

 - FIX: Fixed wrong APB1 frequency check (bug 3361039)(backported to 2.2.7).

 - FIX: Fixed missing state in shell demos (bug 3351556)(backported to 2.2.7).

 - FIX: Fixed race condition in Cortex-Mx ports (bug 3317500)(backported