From b4aa14e88c9e28a16a5f9c0c220fac6cc36750ad Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 18 May 2011 09:03:50 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2971 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/RVCT/ARMCMx/chcore.h | 2 +- os/ports/RVCT/ARMCMx/chcore_v6m.h | 10 +++++----- os/ports/RVCT/ARMCMx/chcore_v7m.h | 14 ++++++-------- 3 files changed, 12 insertions(+), 14 deletions(-) (limited to 'os/ports/RVCT/ARMCMx') diff --git a/os/ports/RVCT/ARMCMx/chcore.h b/os/ports/RVCT/ARMCMx/chcore.h index aa8fe2483..767f71923 100644 --- a/os/ports/RVCT/ARMCMx/chcore.h +++ b/os/ports/RVCT/ARMCMx/chcore.h @@ -305,7 +305,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. diff --git a/os/ports/RVCT/ARMCMx/chcore_v6m.h b/os/ports/RVCT/ARMCMx/chcore_v6m.h index 9c5e35b33..1c4af7da9 100644 --- a/os/ports/RVCT/ARMCMx/chcore_v6m.h +++ b/os/ports/RVCT/ARMCMx/chcore_v6m.h @@ -76,13 +76,13 @@ struct intctx { * @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 because the idle thread does have * a stack frame when compiling without optimizations. You may * reduce this value to zero when compiling with optimizations. */ -#ifndef IDLE_THREAD_STACK_SIZE -#define IDLE_THREAD_STACK_SIZE 16 +#ifndef PORT_IDLE_THREAD_STACK_SIZE +#define PORT_IDLE_THREAD_STACK_SIZE 16 #endif /** @@ -96,8 +96,8 @@ struct intctx { * @p chSchDoRescheduleI() can have a stack frame, expecially with * compiler optimizations disabled. */ -#ifndef INT_REQUIRED_STACK -#define INT_REQUIRED_STACK 16 +#ifndef PORT_INT_REQUIRED_STACK +#define PORT_INT_REQUIRED_STACK 16 #endif /** diff --git a/os/ports/RVCT/ARMCMx/chcore_v7m.h b/os/ports/RVCT/ARMCMx/chcore_v7m.h index 3a4cbe381..7f7d8c5be 100644 --- a/os/ports/RVCT/ARMCMx/chcore_v7m.h +++ b/os/ports/RVCT/ARMCMx/chcore_v7m.h @@ -49,9 +49,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; @@ -78,13 +76,13 @@ struct intctx { * @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. - * @note In this port it is set to 8 because the idle thread does have + * by @p PORT_INT_REQUIRED_STACK. + * @note In this port it is set to 16 because the idle thread does have * a stack frame when compiling without optimizations. You may * reduce this value to zero when compiling with optimizations. */ -#ifndef IDLE_THREAD_STACK_SIZE -#define IDLE_THREAD_STACK_SIZE 8 +#ifndef PORT_IDLE_THREAD_STACK_SIZE +#define PORT_IDLE_THREAD_STACK_SIZE 16 #endif /** @@ -98,8 +96,8 @@ struct intctx { * @p chSchDoRescheduleI() can have a stack frame, expecially with * compiler optimizations disabled. */ -#ifndef INT_REQUIRED_STACK -#define INT_REQUIRED_STACK 16 +#ifndef PORT_INT_REQUIRED_STACK +#define PORT_INT_REQUIRED_STACK 16 #endif /** -- cgit v1.2.3