diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.h b/os/ports/GCC/ARMCMx/chcore_v6m.h index 955778f42..30791f792 100644 --- a/os/ports/GCC/ARMCMx/chcore_v6m.h +++ b/os/ports/GCC/ARMCMx/chcore_v6m.h @@ -66,13 +66,13 @@ * @brief Per-thread stack overhead for interrupts servicing. * @details This constant is used in the calculation of the correct working * area size. - * @note In this port this value is conservatively set to 32 because the + * @note In this port this value is conservatively set to 64 because the * function @p chSchDoReschedule() can have a stack frame, especially * with compiler optimizations disabled. The value can be reduced * when compiler optimizations are enabled. */ #if !defined(PORT_INT_REQUIRED_STACK) -#define PORT_INT_REQUIRED_STACK 32 +#define PORT_INT_REQUIRED_STACK 64 #endif /** diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h index 1afdb42f9..ee1e37731 100644 --- a/os/ports/GCC/ARMCMx/chcore_v7m.h +++ b/os/ports/GCC/ARMCMx/chcore_v7m.h @@ -63,13 +63,13 @@ * @brief Per-thread stack overhead for interrupts servicing. * @details This constant is used in the calculation of the correct working * area size. - * @note In this port this value is conservatively set to 32 because the + * @note In this port this value is conservatively set to 64 because the * function @p chSchDoReschedule() can have a stack frame, especially * with compiler optimizations disabled. The value can be reduced * when compiler optimizations are enabled. */ #if !defined(PORT_INT_REQUIRED_STACK) -#define PORT_INT_REQUIRED_STACK 32 +#define PORT_INT_REQUIRED_STACK 64 #endif /** diff --git a/readme.txt b/readme.txt index bd2ce2f3c..4315610fd 100644 --- a/readme.txt +++ b/readme.txt @@ -89,6 +89,8 @@ ***************************************************************************** *** 2.7.0 *** +- FIX: Fixed insufficient ISR-reserved stack in ARMCMx port when + optimizations are disabled (bug #494)(backported to 2.6.4). - FIX: Fixed configuration descriptors larger than 127 bytes don't work (bug #373)(backported to 2.6.4). - FIX: Fixed invalid cast in PWM_FRACTION_TO_WIDTH() macro (bug #487)