From 25588d58b51b414461007cea4b566e9bddf85961 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 11 Jul 2010 06:03:32 +0000 Subject: Fixed bugs 3026528 and 3027975. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2062 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/GCC/ARMCMx/STM32F10x/vectors.s | 7 +++++++ os/ports/GCC/MSP430/chcore.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'os/ports') 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; -- cgit v1.2.3