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 6b4a9700c620fbcab4ca446cf4df5f4b00988af3..969e6a0f7b6a23a7433785f114c76765005509bb 100644 (file)
--- a/src/stm/ao_interrupt.c
+++ b/src/stm/ao_interrupt.c
@@ -15,8 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#include <ao.h>
 #include "stm32l.h"
 #include <string.h>
+#include <ao_boot.h>
 
 extern void main(void);
 extern char __stack__;
@@ -28,14 +30,26 @@ extern char __bss_start__, __bss_end__;
 
 void stm_halt_isr(void)
 {
-       for(;;);
+       ao_panic(AO_PANIC_CRASH);
 }
 
 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();