diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-01-07 17:04:56 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-01-07 17:04:56 +0000 |
| commit | 83dc781cdc2a3ff60873c2a7f6dfd4e77e2642d3 (patch) | |
| tree | 80c97d414316665e9df27f134fe04748f471c9fc /os | |
| parent | 3f9e76264a6f921975ad78f208c4a94968867ec9 (diff) | |
| download | ChibiOS-83dc781cdc2a3ff60873c2a7f6dfd4e77e2642d3.tar.gz ChibiOS-83dc781cdc2a3ff60873c2a7f6dfd4e77e2642d3.tar.bz2 ChibiOS-83dc781cdc2a3ff60873c2a7f6dfd4e77e2642d3.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2610 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/ports/IAR/ARMCMx/LPC13xx/vectors.s | 51 | ||||
| -rw-r--r-- | os/ports/IAR/ARMCMx/STM32/vectors.s | 51 |
2 files changed, 51 insertions, 51 deletions
diff --git a/os/ports/IAR/ARMCMx/LPC13xx/vectors.s b/os/ports/IAR/ARMCMx/LPC13xx/vectors.s index 193150f38..69e0c8add 100644 --- a/os/ports/IAR/ARMCMx/LPC13xx/vectors.s +++ b/os/ports/IAR/ARMCMx/LPC13xx/vectors.s @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined(STM32F10X_LD) && !defined(STM32F10X_LD_VL) && \
- !defined(STM32F10X_MD) && !defined(STM32F10X_MD_VL) && \
- !defined(STM32F10X_HD) && !defined(STM32F10X_XL) && \
- !defined(STM32F10X_CL)
-#define _FROM_ASM_
-#include "board.h"
-#endif
-
MODULE ?vectors
AAPCS INTERWORK, VFP_COMPATIBLE, RWPI_COMPATIBLE
@@ -98,13 +90,9 @@ __vector_table: DCD VectorE0
DCD VectorE4
DCD VectorE8
-#if defined(STM32F10X_MD_VL) || defined(STM32F10X_HD) || \
- defined(STM32F10X_XL) || defined(STM32F10X_CL)
DCD VectorEC
DCD VectorF0
DCD VectorF4
-#endif
-#if defined(STM32F10X_HD) || defined(STM32F10X_XL) || defined(STM32F10X_CL)
DCD VectorF8
DCD VectorFC
DCD Vector100
@@ -115,21 +103,6 @@ __vector_table: DCD Vector114
DCD Vector118
DCD Vector11C
- DCD Vector120
- DCD Vector124
- DCD Vector128
- DCD Vector12C
-#endif
-#if defined(STM32F10X_CL)
- DCD Vector130
- DCD Vector134
- DCD Vector138
- DCD Vector13C
- DCD Vector140
- DCD Vector144
- DCD Vector148
- DCD Vector14C
-#endif
/*
* Default interrupt handlers.
@@ -204,18 +177,6 @@ __vector_table: PUBWEAK Vector114
PUBWEAK Vector118
PUBWEAK Vector11C
- PUBWEAK Vector120
- PUBWEAK Vector124
- PUBWEAK Vector128
- PUBWEAK Vector12C
- PUBWEAK Vector130
- PUBWEAK Vector134
- PUBWEAK Vector138
- PUBWEAK Vector13C
- PUBWEAK Vector140
- PUBWEAK Vector144
- PUBWEAK Vector148
- PUBWEAK Vector14C
PUBLIC _unhandled_exception
SECTION .text:CODE:REORDER(1)
@@ -291,18 +252,6 @@ Vector110 Vector114
Vector118
Vector11C
-Vector120
-Vector124
-Vector128
-Vector12C
-Vector130
-Vector134
-Vector138
-Vector13C
-Vector140
-Vector144
-Vector148
-Vector14C
_unhandled_exception
b _unhandled_exception
diff --git a/os/ports/IAR/ARMCMx/STM32/vectors.s b/os/ports/IAR/ARMCMx/STM32/vectors.s index 69e0c8add..193150f38 100644 --- a/os/ports/IAR/ARMCMx/STM32/vectors.s +++ b/os/ports/IAR/ARMCMx/STM32/vectors.s @@ -17,6 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#if !defined(STM32F10X_LD) && !defined(STM32F10X_LD_VL) && \
+ !defined(STM32F10X_MD) && !defined(STM32F10X_MD_VL) && \
+ !defined(STM32F10X_HD) && !defined(STM32F10X_XL) && \
+ !defined(STM32F10X_CL)
+#define _FROM_ASM_
+#include "board.h"
+#endif
+
MODULE ?vectors
AAPCS INTERWORK, VFP_COMPATIBLE, RWPI_COMPATIBLE
@@ -90,9 +98,13 @@ __vector_table: DCD VectorE0
DCD VectorE4
DCD VectorE8
+#if defined(STM32F10X_MD_VL) || defined(STM32F10X_HD) || \
+ defined(STM32F10X_XL) || defined(STM32F10X_CL)
DCD VectorEC
DCD VectorF0
DCD VectorF4
+#endif
+#if defined(STM32F10X_HD) || defined(STM32F10X_XL) || defined(STM32F10X_CL)
DCD VectorF8
DCD VectorFC
DCD Vector100
@@ -103,6 +115,21 @@ __vector_table: DCD Vector114
DCD Vector118
DCD Vector11C
+ DCD Vector120
+ DCD Vector124
+ DCD Vector128
+ DCD Vector12C
+#endif
+#if defined(STM32F10X_CL)
+ DCD Vector130
+ DCD Vector134
+ DCD Vector138
+ DCD Vector13C
+ DCD Vector140
+ DCD Vector144
+ DCD Vector148
+ DCD Vector14C
+#endif
/*
* Default interrupt handlers.
@@ -177,6 +204,18 @@ __vector_table: PUBWEAK Vector114
PUBWEAK Vector118
PUBWEAK Vector11C
+ PUBWEAK Vector120
+ PUBWEAK Vector124
+ PUBWEAK Vector128
+ PUBWEAK Vector12C
+ PUBWEAK Vector130
+ PUBWEAK Vector134
+ PUBWEAK Vector138
+ PUBWEAK Vector13C
+ PUBWEAK Vector140
+ PUBWEAK Vector144
+ PUBWEAK Vector148
+ PUBWEAK Vector14C
PUBLIC _unhandled_exception
SECTION .text:CODE:REORDER(1)
@@ -252,6 +291,18 @@ Vector110 Vector114
Vector118
Vector11C
+Vector120
+Vector124
+Vector128
+Vector12C
+Vector130
+Vector134
+Vector138
+Vector13C
+Vector140
+Vector144
+Vector148
+Vector14C
_unhandled_exception
b _unhandled_exception
|