diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-04-25 09:33:30 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-04-25 09:33:30 +0000 |
| commit | 464ab9297ac103d973421c2210e74f8de4c12f36 (patch) | |
| tree | 633458893df8ad17fd2e4e2c43d04958ca684e42 /os/ports | |
| parent | 1fbfd93a98f00a583ded741fa0218b436e1172ac (diff) | |
| download | ChibiOS-464ab9297ac103d973421c2210e74f8de4c12f36.tar.gz ChibiOS-464ab9297ac103d973421c2210e74f8de4c12f36.tar.bz2 ChibiOS-464ab9297ac103d973421c2210e74f8de4c12f36.zip | |
Updated MSP port.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4134 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports')
| -rw-r--r-- | os/ports/GCC/MSP430/chcore.h | 6 | ||||
| -rw-r--r-- | os/ports/GCC/MSP430/rules.mk | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/os/ports/GCC/MSP430/chcore.h b/os/ports/GCC/MSP430/chcore.h index d5cc1f512..290a9fbdb 100644 --- a/os/ports/GCC/MSP430/chcore.h +++ b/os/ports/GCC/MSP430/chcore.h @@ -30,7 +30,7 @@ #define _CHCORE_H_
#include <iomacros.h>
-#include <msp430/common.h>
+#include <isr_compat.h>
#if CH_DBG_ENABLE_STACK_CHECK
#error "option CH_DBG_ENABLE_STACK_CHECK not supported by this port"
@@ -194,12 +194,14 @@ struct context { dbg_check_unlock(); \
}
+#define ISRNAME(pre, id) pre##id
+
/**
* @brief IRQ handler function declaration.
* @note @p id can be a function name or a vector number depending on the
* port implementation.
*/
-#define PORT_IRQ_HANDLER(id) interrupt(id) _vect_##id(void)
+#define PORT_IRQ_HANDLER(id) ISR(id, ISRNAME(vect, id))
/**
* @brief Port-related initialization code.
diff --git a/os/ports/GCC/MSP430/rules.mk b/os/ports/GCC/MSP430/rules.mk index 81eb443eb..e5df10916 100644 --- a/os/ports/GCC/MSP430/rules.mk +++ b/os/ports/GCC/MSP430/rules.mk @@ -4,9 +4,6 @@ OPT = $(USE_OPT)
COPT = $(USE_COPT)
CPPOPT = $(USE_CPPOPT)
-ifeq ($(USE_CURRP_CACHING),yes)
- OPT += -ffixed-r7 -DCH_CURRP_REGISTER_CACHE='"r7"'
-endif
ifeq ($(USE_LINK_GC),yes)
OPT += -ffunction-sections -fdata-sections
endif
|