zain aftab / mbed-src

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 607:12ecb532fd15, committed 2015-08-13

Comitter:
mbed_official
Date:
Thu Aug 13 11:45:08 2015 +0100
Parent:
606:ded2017be6ab
Child:
608:ae528ef7bd3d
Commit message:
Synchronized with git revision bd9a1685058d09a17953431dba5541ef33b688bf

Full URL: https://github.com/mbedmicro/mbed/commit/bd9a1685058d09a17953431dba5541ef33b688bf/

KL46Z - Ensure the NVIC table gets copied to RAM even when it is not at 0x0000

Changed in this revision

targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/cmsis_nvic.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/cmsis_nvic.c	Thu Aug 13 11:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/cmsis_nvic.c	Thu Aug 13 11:45:08 2015 +0100
@@ -31,14 +31,14 @@
 #include "cmsis_nvic.h"
 
 #define NVIC_RAM_VECTOR_ADDRESS (0x1FFFE000)  // Vectors positioned at start of RAM
-#define NVIC_FLASH_VECTOR_ADDRESS (0x0)       // Initial vector position in flash
+#define NVIC_FLASH_VECTOR_ADDRESS (__vector_table)       // Initial vector position in flash
 
 void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
     uint32_t *vectors = (uint32_t*)SCB->VTOR;
     uint32_t i;
 
     // Copy and switch to dynamic vectors if the first time called
-    if (SCB->VTOR == NVIC_FLASH_VECTOR_ADDRESS) {
+    if (SCB->VTOR < NVIC_RAM_VECTOR_ADDRESS) {
         uint32_t *old_vectors = vectors;
         vectors = (uint32_t*)NVIC_RAM_VECTOR_ADDRESS;
         for (i=0; i<NVIC_NUM_VECTORS; i++) {