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

6 files changed, 47 insertions, 29 deletions

diff --git a/demos/MSP430-MSP430x1611-GCC/main.c b/demos/MSP430-MSP430x1611-GCC/main.c
index 911ba84d9..4bc7d9895 100644
--- a/demos/MSP430-MSP430x1611-GCC/main.c
+++ b/demos/MSP430-MSP430x1611-GCC/main.c
@@ -26,7 +26,7 @@
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WorkingArea(waThread1, 64);

+static WORKING_AREA(waThread1, 64);

 static msg_t Thread1(void *arg) {

 

   while (TRUE) {

diff --git a/ports/ARM7/chcore.h b/ports/ARM7/chcore.h
index ee18aab25..470b9de26 100644
--- a/ports/ARM7/chcore.h
+++ b/ports/ARM7/chcore.h
@@ -20,7 +20,7 @@
 #ifndef _CHCORE_H_

 #define _CHCORE_H_

 

-/**

+/*

  * Macro defining the ARM7 architecture.

  */

 #define CH_ARCHITECTURE_ARM7

diff --git a/ports/ARMCM3/chcore.h b/ports/ARMCM3/chcore.h
index 6474d91d0..c11b948eb 100644
--- a/ports/ARMCM3/chcore.h
+++ b/ports/ARMCM3/chcore.h
@@ -27,7 +27,7 @@
 #define BASEPRI_KERNEL  0x10    /* BASEPRI level within kernel lock.    */
 #define ENABLE_WFI_IDLE 0       /* Enables the use of the WFI ins.      */
 
-/**
+/*
  * Macro defining the ARM Cortex-M3 architecture.
  */
 #define CH_ARCHITECTURE_ARMCM3
diff --git a/ports/AVR/chcore.h b/ports/AVR/chcore.h
index 534575874..421c9028f 100644
--- a/ports/AVR/chcore.h
+++ b/ports/AVR/chcore.h
@@ -20,7 +20,7 @@
 #ifndef _CHCORE_H_

 #define _CHCORE_H_

 

-/**

+/*

  * Macro defining the AVR architecture.

  */

 #define CH_ARCHITECTURE_AVR

diff --git a/ports/MSP430/chcore.c b/ports/MSP430/chcore.c
index b2ff849d6..dc340f9c9 100644
--- a/ports/MSP430/chcore.c
+++ b/ports/MSP430/chcore.c
@@ -25,7 +25,7 @@
  * The priority is internally set to the minimum system value so that this

  * thread is executed only if there are no other ready threads in the system.

  */

-void _IdleThread(void *p) {

+void _idle(void *p) {

 

   while (TRUE)

     ;

diff --git a/ports/MSP430/chcore.h b/ports/MSP430/chcore.h
index ea239c688..4333ca841 100644
--- a/ports/MSP430/chcore.h
+++ b/ports/MSP430/chcore.h
@@ -23,36 +23,47 @@
 #include <iomacros.h>

 #include <msp430/common.h>

 

+/*

+ * Macro defining the MSP430 architecture.

+ */

 #define CH_ARCHITECTURE_MSP430

 

-typedef void *regmsp;

+/*

+ * 16 bit stack alignment.

+ */

+typedef uint16_t stkalign_t;

+

+/*

+ * Generic MSP430 register.

+ */

+typedef void *regmsp_t;

 

 /*

  * Interrupt saved context.

  */

 struct extctx {

-  regmsp        r12;

-  regmsp        r13;

-  regmsp        r14;

-  regmsp        r15;

-  regmsp        sr;

-  regmsp        pc;

+  regmsp_t      r12;

+  regmsp_t      r13;

+  regmsp_t      r14;

+  regmsp_t      r15;

+  regmsp_t      sr;

+  regmsp_t      pc;

 };

 

 /*

  * System saved context.

  */

 struct intctx {

-  regmsp        r4;

-  regmsp        r5;

-  regmsp        r6;

-  regmsp        r7;

-  regmsp        r8;

-  regmsp        r9;

-  regmsp        r10;

-  regmsp        r11;

-//  regmsp        sr;

-  regmsp        pc;

+  regmsp_t      r4;

+  regmsp_t      r5;

+  regmsp_t      r6;

+  regmsp_t      r7;

+  regmsp_t      r8;

+  regmsp_t      r9;

+  regmsp_t      r10;

+  regmsp_t      r11;

+//  regmsp_t      sr;

+  regmsp_t      pc;

 };

 

 typedef struct {

@@ -71,12 +82,19 @@ typedef struct {
 #define IDLE_THREAD_STACK_SIZE 0

 

 #define INT_REQUIRED_STACK 32

-#define StackAlign(n) ((((n) - 1) | 1) + 1)

-#define UserStackSize(n) StackAlign(sizeof(Thread) +                    \

-                                    sizeof(struct intctx) +             \

-                                    sizeof(struct extctx) +             \

-                                    (n) + (INT_REQUIRED_STACK))

-#define WorkingArea(s, n) uint16_t s[UserStackSize(n >> 1)];

+

+#define STACK_ALIGN(n) ((((n) - 1) | sizeof(stkalign_t)) + 1)

+//#define StackAlign(n) STACK_ALIGN(n)

+

+#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) +                     \

+                                   sizeof(struct intctx) +              \

+                                   sizeof(struct extctx) +              \

+                                   (n) +                                \

+                                   INT_REQUIRED_STACK)

+//#define UserStackSize(n) THD_WA_SIZE(n)

+

+#define WORKING_AREA(s, n) stkalign_t s[THD_WA_SIZE(n) / sizeof(stkalign_t)];

+//#define WorkingArea(s, n) WORKING_AREA(s, n)

 

 #define chSysLock() asm volatile ("dint")

 #define chSysUnlock() asm volatile ("eint")

@@ -91,7 +109,7 @@ typedef struct {
 #ifdef __cplusplus

 extern "C" {

 #endif

-  void _IdleThread(void *p);

+  void _idle(void *p) __attribute__((weak, noreturn));

   void chSysHalt(void);

   void chSysSwitchI(Thread *otp, Thread *ntp);

   void chSysPuts(char *msg);