summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-04-23 09:32:11 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-04-23 09:32:11 -0600
commitf68c65d6d0ce52416706b86b6fcc8537e6337310 (patch)
tree10edff9fc72f215b1903230da06f3a4a29f36213 /nuttx/arch/arm
parent15ef6af520b78a3f4e01287c4ee47a5eb3ce36a7 (diff)
downloadpx4-nuttx-f68c65d6d0ce52416706b86b6fcc8537e6337310.tar.gz
px4-nuttx-f68c65d6d0ce52416706b86b6fcc8537e6337310.tar.bz2
px4-nuttx-f68c65d6d0ce52416706b86b6fcc8537e6337310.zip
Correction to ARM RAM vectors logic from Paul Y. Zhang
Diffstat (limited to 'nuttx/arch/arm')
-rw-r--r--nuttx/arch/arm/src/armv7-m/ram_vectors.h2
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_ramvec_initialize.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/armv7-m/ram_vectors.h b/nuttx/arch/arm/src/armv7-m/ram_vectors.h
index 4cbe42d8c..90bcc30e6 100644
--- a/nuttx/arch/arm/src/armv7-m/ram_vectors.h
+++ b/nuttx/arch/arm/src/armv7-m/ram_vectors.h
@@ -68,7 +68,7 @@
* the table.
*/
-#define ARMV7M_VECTAB_SIZE (ARMV7M_PERIPHERAL_INTERRUPTS)
+#define ARMV7M_VECTAB_SIZE (ARMV7M_PERIPHERAL_INTERRUPTS + 16)
/************************************************************************************
* Public Data
diff --git a/nuttx/arch/arm/src/armv7-m/up_ramvec_initialize.c b/nuttx/arch/arm/src/armv7-m/up_ramvec_initialize.c
index 3d33f61c8..806bdf3fc 100644
--- a/nuttx/arch/arm/src/armv7-m/up_ramvec_initialize.c
+++ b/nuttx/arch/arm/src/armv7-m/up_ramvec_initialize.c
@@ -100,7 +100,7 @@ void up_ramvec_initialize(void)
/* The vector table must be aligned */
- DEBUGASSERT(((uintptr)g_ram_vectors & ~NVIC_VECTAB_TBLOFF_MASK) == 0);
+ DEBUGASSERT(((uint32_t)g_ram_vectors & ~NVIC_VECTAB_TBLOFF_MASK) == 0);
/* Copy the ROM vector table at address zero to RAM vector table.
*