altos/stmf0: Change tests for AO_BOOT_CHAIN and AO_BOOT_PIN to #if

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

diff --git a/src/stmf0/ao_interrupt.c b/src/stmf0/ao_interrupt.c
index b6a3147f37ae36207de805a30943d563be319819..0d6f61131c0532d87e4daac9a9dafd8a895d2320 100644 (file)
--- a/src/stmf0/ao_interrupt.c
+++ b/src/stmf0/ao_interrupt.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,9 +26,11 @@
 #define IS_FLASH_LOADER        0
 #endif
 
+#ifndef RELOCATE_INTERRUPT
 #if !IS_FLASH_LOADER
 #define RELOCATE_INTERRUPT     1
 #endif
+#endif
 
 extern void main(void);
 extern char __stack__;
@@ -66,14 +69,17 @@ stm_flash_size(void) {
 
 void start(void)
 {
-#ifdef AO_BOOT_CHAIN
+#if AO_BOOT_CHAIN
        if (ao_boot_check_chain()) {
-#ifdef AO_BOOT_PIN
+#if AO_BOOT_PIN
                ao_boot_check_pin();
 #endif
        }
 #endif
 #if RELOCATE_INTERRUPT
+       /* Turn on syscfg */
+       stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_SYSCFGCOMPEN);
+
        memcpy(&__interrupt_start__, &__interrupt_rom__, &__interrupt_end__ - &__interrupt_start__);
        stm_syscfg.cfgr1 = (stm_syscfg.cfgr1 & ~(STM_SYSCFG_CFGR1_MEM_MODE_MASK << STM_SYSCFG_CFGR1_MEM_MODE)) |
                (STM_SYSCFG_CFGR1_MEM_MODE_SRAM << STM_SYSCFG_CFGR1_MEM_MODE);
@@ -112,8 +118,8 @@ isr(exti2_3)
 isr(exti4_15)
 isr(tsc)
 isr(dma_ch1)
-isr(dma_ch2_3_dma2_ch1_2)
-isr(dma_ch4_5_6_7_dma2_ch3_4_5)
+isr(dma_ch2_3)
+isr(dma_ch4_5_6)
 isr(adc_comp)
 isr(tim1_brk_up_trg_com)
 isr(tim1_cc)
@@ -157,8 +163,8 @@ const void *stm_interrupt_vector[] = {
        i(0x5c, exti4_15),
        i(0x60, tsc),
        i(0x64, dma_ch1),
-       i(0x68, dma_ch2_3_dma2_ch1_2),
-       i(0x6c, dma_ch4_5_6_7_dma2_ch3_4_5),
+       i(0x68, dma_ch2_3),
+       i(0x6c, dma_ch4_5_6),
        i(0x70, adc_comp),
        i(0x74, tim1_brk_up_trg_com),
        i(0x78, tim1_cc),