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

3 files changed, 8 insertions, 8 deletions

diff --git a/os/kernel/src/chsys.c b/os/kernel/src/chsys.c
index cd4832831..2494706d7 100644
--- a/os/kernel/src/chsys.c
+++ b/os/kernel/src/chsys.c
@@ -52,7 +52,7 @@
 /**

  * @brief   Idle thread working area.

  */

-static WORKING_AREA(_idle_thread_wa, PORT_IDLE_THREAD_STACK_SIZE);

+static WORKING_AREA(_idle_thread_wa, CH_PORT_IDLE_THREAD_STACK_SIZE);

 #endif /* CH_CFG_NO_IDLE_THREAD */

 

 /*===========================================================================*/

diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h
index e3a6c627c..4cadae90b 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.h
@@ -96,8 +96,8 @@
  *          a stack frame when compiling without optimizations. You may

  *          reduce this value to zero when compiling with optimizations.

  */

-#if !defined(PORT_IDLE_THREAD_STACK_SIZE)

-#define PORT_IDLE_THREAD_STACK_SIZE     16

+#if !defined(CH_PORT_IDLE_THREAD_STACK_SIZE) || defined(__DOXYGEN__)

+#define CH_PORT_IDLE_THREAD_STACK_SIZE  16

 #endif

 

 /**

@@ -109,8 +109,8 @@
  *          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

+#if !defined(CH_PORT_INT_REQUIRED_STACK) || defined(__DOXYGEN__)

+#define CH_PORT_INT_REQUIRED_STACK      32

 #endif

 

 /**

@@ -330,7 +330,7 @@ struct context {
 #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(thread_t) +                       \

                                    sizeof(struct intctx) +                  \

                                    sizeof(struct extctx) +                  \

-                                   (n) + (PORT_INT_REQUIRED_STACK))

+                                   (n) + (CH_PORT_INT_REQUIRED_STACK))

 

 /**

  * @brief   Static working area allocation.

diff --git a/test/testbmk.c b/test/testbmk.c
index 3c0aed9df..0dadc7652 100644
--- a/test/testbmk.c
+++ b/test/testbmk.c
@@ -637,10 +637,10 @@ static void bmk13_execute(void) {
 

   test_print("--- System: ");

   test_printn(sizeof(ready_list_t) + sizeof(virtual_timers_list_t) +

-              PORT_IDLE_THREAD_STACK_SIZE +

+              CH_PORT_IDLE_THREAD_STACK_SIZE +

               (sizeof(thread_t) + sizeof(struct intctx) +

                sizeof(struct extctx) +

-               PORT_INT_REQUIRED_STACK) * 2);

+               CH_PORT_INT_REQUIRED_STACK) * 2);

   test_println(" bytes");

   test_print("--- Thread: ");

   test_printn(sizeof(thread_t));