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

2 files changed, 6 insertions, 12 deletions

diff --git a/os/ports/GCC/AVR/chcore.c b/os/ports/GCC/AVR/chcore.c
index 166c0d1b1..7cb0dda07 100644
--- a/os/ports/GCC/AVR/chcore.c
+++ b/os/ports/GCC/AVR/chcore.c
@@ -51,10 +51,8 @@ void port_switch(Thread *ntp, Thread *otp) {
   asm volatile ("push    r5");

   asm volatile ("push    r6");

   asm volatile ("push    r7");

-#ifndef CH_CURRP_REGISTER_CACHE

   asm volatile ("push    r8");

   asm volatile ("push    r9");

-#endif

   asm volatile ("push    r10");

   asm volatile ("push    r11");

   asm volatile ("push    r12");

@@ -88,10 +86,8 @@ void port_switch(Thread *ntp, Thread *otp) {
   asm volatile ("pop     r12");

   asm volatile ("pop     r11");

   asm volatile ("pop     r10");

-#ifndef CH_CURRP_REGISTER_CACHE

   asm volatile ("pop     r9");

   asm volatile ("pop     r8");

-#endif

   asm volatile ("pop     r7");

   asm volatile ("pop     r6");

   asm volatile ("pop     r5");

diff --git a/os/ports/GCC/AVR/chcore.h b/os/ports/GCC/AVR/chcore.h
index 4377c5047..5e1c4d954 100644
--- a/os/ports/GCC/AVR/chcore.h
+++ b/os/ports/GCC/AVR/chcore.h
@@ -105,10 +105,8 @@ struct intctx {
   uint8_t       r12;

   uint8_t       r11;

   uint8_t       r10;

-#ifndef CH_CURRP_REGISTER_CACHE

   uint8_t       r9;

   uint8_t       r8;

-#endif

   uint8_t       r7;

   uint8_t       r6;

   uint8_t       r5;

@@ -149,11 +147,11 @@ 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 8.

  */

-#ifndef IDLE_THREAD_STACK_SIZE

-#define IDLE_THREAD_STACK_SIZE 8

+#ifndef PORT_IDLE_THREAD_STACK_SIZE

+#define PORT_IDLE_THREAD_STACK_SIZE     8

 #endif

 

 /**

@@ -165,8 +163,8 @@ struct context {
  *          @p extctx is known to be zero.

  * @note    In this port the default is 32 bytes per thread.

  */

-#ifndef INT_REQUIRED_STACK

-#define INT_REQUIRED_STACK 32

+#ifndef PORT_INT_REQUIRED_STACK

+#define PORT_INT_REQUIRED_STACK     32

 #endif

 

 /**

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

                                    (sizeof(struct intctx) - 1) +        \

                                    (sizeof(struct extctx) - 1) +        \

-                                   (n) + (INT_REQUIRED_STACK))

+                                   (n) + (PORT_INT_REQUIRED_STACK))

 

 /**

  * @brief   Static working area allocation.