mbed SDK library sources

Fork of mbed-src by mbed official

Development branch of the mbed library sources. This library is kept in synch with the latest changes from the mbed SDK and it is not guaranteed to work.

If you are looking for a stable and tested release, please import one of the official mbed library releases:

Import librarymbed

The official Mbed 2 C/C++ SDK provides the software platform and libraries to build your applications.

Files at this revision

API Documentation at this revision

Comitter:
mbed_official
Date:
Fri Oct 25 13:30:04 2013 +0100
Parent:
38:340917a6c27d
Child:
40:5fa4b7c54c1d
Commit message:
Synchronized with git revision 7a15854fb8d9be2511f9147b578e93525f1a3f1a

Changed in this revision

targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.c Show annotated file Show diff for this revision Revisions of this file
--- a/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.c	Fri Oct 25 13:00:07 2013 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.c	Fri Oct 25 13:30:04 2013 +0100
@@ -6,20 +6,22 @@
 #include "cmsis_nvic.h"
 
 #define NVIC_RAM_VECTOR_ADDRESS   (0x20000000)  // Location of vectors in RAM
-#define NVIC_FLASH_VECTOR_ADDRESS (0x0)         // Initial vector position in flash
+
+static unsigned char vtor_relocated;
 
 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 (!vtor_relocated) {
         uint32_t *old_vectors = vectors;
         vectors = (uint32_t*)NVIC_RAM_VECTOR_ADDRESS;
         for (i=0; i<NVIC_NUM_VECTORS; i++) {
             vectors[i] = old_vectors[i];
         }
         SCB->VTOR = (uint32_t)NVIC_RAM_VECTOR_ADDRESS;
+        vtor_relocated = 1;
     }
     vectors[IRQn + 16] = vector;
 }