diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-07-11 06:03:32 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-07-11 06:03:32 +0000 |
| commit | 25588d58b51b414461007cea4b566e9bddf85961 (patch) | |
| tree | 050122e9dfc2cc79702353634779f4c16044576e | |
| parent | f6554b6135a1ca9cb4b2aa05b7cbc94f828ed996 (diff) | |
| download | ChibiOS-25588d58b51b414461007cea4b566e9bddf85961.tar.gz ChibiOS-25588d58b51b414461007cea4b566e9bddf85961.tar.bz2 ChibiOS-25588d58b51b414461007cea4b566e9bddf85961.zip | |
Fixed bugs 3026528 and 3027975.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2062 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/ports/GCC/ARMCMx/STM32F10x/vectors.s | 7 | ||||
| -rw-r--r-- | os/ports/GCC/MSP430/chcore.c | 2 | ||||
| -rw-r--r-- | readme.txt | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/os/ports/GCC/ARMCMx/STM32F10x/vectors.s b/os/ports/GCC/ARMCMx/STM32F10x/vectors.s index 58b0f8aea..0d516fb04 100644 --- a/os/ports/GCC/ARMCMx/STM32F10x/vectors.s +++ b/os/ports/GCC/ARMCMx/STM32F10x/vectors.s @@ -20,6 +20,13 @@ .syntax unified
.thumb
+/* If the macro is not defined in the Makefile then a board.h file must be
+ provided containing the definition of the STM32 family member.*/
+#if !defined(STM32F10X_LD) && !defined(STM32F10X_MD) && \
+ !defined(STM32F10X_HD) && !defined(STM32F10X_CL)
+#include "board.h"
+#endif
+
.section vectors
_vectors:
.word __ram_end__
diff --git a/os/ports/GCC/MSP430/chcore.c b/os/ports/GCC/MSP430/chcore.c index 43528f9c5..6740780a9 100644 --- a/os/ports/GCC/MSP430/chcore.c +++ b/os/ports/GCC/MSP430/chcore.c @@ -51,7 +51,7 @@ void port_switch(Thread *ntp, Thread *otp) { "push r8 \n\t" \
"push r7 \n\t" \
"push r6 \n\t" \
- "push r6 \n\t" \
+ "push r5 \n\t" \
"push r4");
otp->p_ctx.sp = sp;
sp = ntp->p_ctx.sp;
diff --git a/readme.txt b/readme.txt index 68eaa757a..71b8b11f6 100644 --- a/readme.txt +++ b/readme.txt @@ -59,6 +59,9 @@ *****************************************************************************
*** 2.1.1 ***
+- FIX: Fixed invalid contex restore in MSP430 port (bug 3027975)(backported
+ to 2.0.2).
+- FIX: Fixed STM32 vectors file (bug 3026528)(backported to 2.0.2).
- FIX: Fixed race condition in STM32 SPI driver (bug 3025854)(backported to
2.0.2).
- FIX: Fixed H_LOCK and H_UNLOCK redefined with CH_USE_MALLOC_HEAP (bug
|