Merge branch 'master-fixes' into stm-flash-fixes

[fw/altos] / src / stm / ao_interrupt.c

diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index a423d8b13b1f76ad4ab2524602da956e8a74eadb..969e6a0f7b6a23a7433785f114c76765005509bb 100644 (file)
--- a/src/stm/ao_interrupt.c
+++ b/src/stm/ao_interrupt.c
@@ -18,6 +18,7 @@
 #include <ao.h>
 #include "stm32l.h"
 #include <string.h>
+#include <ao_boot.h>
 
 extern void main(void);
 extern char __stack__;
@@ -36,7 +37,19 @@ void stm_ignore_isr(void)
 {
 }
 
-void start(void) {
+const void *stm_interrupt_vector[];
+
+void start(void)
+{
+#ifdef AO_BOOT_CHAIN
+       if (ao_boot_check_chain()) {
+#ifdef AO_BOOT_PIN
+               ao_boot_check_pin();
+#endif
+       }
+#endif
+       /* Set interrupt vector table offset */
+       stm_nvic.vto = (uint32_t) &stm_interrupt_vector;
        memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
        memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
        main();