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

1 files changed, 6 insertions, 8 deletions

diff --git a/os/ports/GCC/ARM/chcore.h b/os/ports/GCC/ARM/chcore.h
index b67fb9c1b..5a36d82c8 100644
--- a/os/ports/GCC/ARM/chcore.h
+++ b/os/ports/GCC/ARM/chcore.h
@@ -155,9 +155,7 @@ struct intctx {
   regarm_t      r4;

   regarm_t      r5;

   regarm_t      r6;

-#ifndef CH_CURRP_REGISTER_CACHE

   regarm_t      r7;

-#endif

   regarm_t      r8;

   regarm_t      r9;

   regarm_t      r10;

@@ -192,12 +190,12 @@ struct context {
  * @brief   Stack size for the system idle thread.

  * @details This size depends on the idle thread implementation, usually

  *          the idle thread should take no more space than those reserved

- *          by @p INT_REQUIRED_STACK.

+ *          by @p PORT_INT_REQUIRED_STACK.

  * @note    In this port it is set to 4 because the idle thread does have

  *          a stack frame when compiling without optimizations.

  */

-#ifndef IDLE_THREAD_STACK_SIZE

-#define IDLE_THREAD_STACK_SIZE      4

+#ifndef PORT_IDLE_THREAD_STACK_SIZE

+#define PORT_IDLE_THREAD_STACK_SIZE     4

 #endif

 

 /**

@@ -210,8 +208,8 @@ struct context {
  * @note    In this port 0x10 is a safe value, it can be reduced after careful

  *          analysis of the generated code.

  */

-#ifndef INT_REQUIRED_STACK

-#define INT_REQUIRED_STACK          0x10

+#ifndef PORT_INT_REQUIRED_STACK

+#define PORT_INT_REQUIRED_STACK         0x10

 #endif

 

 /**

@@ -225,7 +223,7 @@ struct context {
 #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                         \

                                    sizeof(struct intctx) +                  \

                                    sizeof(struct extctx) +                  \

-                                  (n) + (INT_REQUIRED_STACK))

+                                  (n) + (PORT_INT_REQUIRED_STACK))

 

 /**

  * @brief   Static working area allocation.