X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_interrupt.c;h=3d7dc7a82c653e2eff6be3327b4edd252ae6ad88;hb=2108da105ed9c915fc09d1251dc655bf11203d79;hp=b6a3147f37ae36207de805a30943d563be319819;hpb=df881bce8576f091b2d8cb53b8ce8a43aeedecde;p=fw%2Faltos

diff --git a/src/stmf0/ao_interrupt.c b/src/stmf0/ao_interrupt.c
index b6a3147f..3d7dc7a8 100644
--- 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,17 +26,10 @@
 #define IS_FLASH_LOADER	0
 #endif
 
+#ifndef RELOCATE_INTERRUPT
 #if !IS_FLASH_LOADER
 #define RELOCATE_INTERRUPT	1
 #endif
-
-extern void main(void);
-extern char __stack__;
-extern char __text_start__, __text_end__;
-extern char __data_start__, __data_end__;
-extern char __bss_start__, __bss_end__;
-#if RELOCATE_INTERRUPT
-extern char __interrupt_rom__, __interrupt_start__, __interrupt_end__;
 #endif
 
 /* Interrupt functions */
@@ -49,8 +43,6 @@ void stm_ignore_isr(void)
 {
 }
 
-const void *stm_interrupt_vector[];
-
 uint32_t
 stm_flash_size(void) {
 	uint16_t	dev_id = stm_dev_id();
@@ -64,25 +56,6 @@ stm_flash_size(void) {
 	return (uint32_t) kbytes * 1024;
 }
 
-void start(void)
-{
-#ifdef AO_BOOT_CHAIN
-	if (ao_boot_check_chain()) {
-#ifdef AO_BOOT_PIN
-		ao_boot_check_pin();
-#endif
-	}
-#endif
-#if RELOCATE_INTERRUPT
-	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);
-#endif
-	memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
-	memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
-	main();
-}
-
 #define STRINGIFY(x) #x
 
 #define isr(name) \
@@ -112,8 +85,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)
@@ -135,12 +108,19 @@ isr(usart3_4_5_6_7_8)
 isr(cec_can)
 isr(usb)
 
+#undef isr
+#undef isr_halt
+
 #define i(addr,name)	[(addr)/4] = stm_ ## name ## _isr
 
-__attribute__ ((section(".interrupt")))
-const void *stm_interrupt_vector[] = {
-	[0] = &__stack__,
-	[1] = start,
+extern char __stack[];
+void _start(void) __attribute__((__noreturn__));
+void main(void) __attribute__((__noreturn__));
+
+__attribute__ ((section(".init")))
+const void * const __interrupt_vector[0x30] = {
+	[0] = __stack,
+	[1] = _start,
 	i(0x08, nmi),
 	i(0x0c, hardfault),
 	i(0x2c, svc),
@@ -157,8 +137,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),
@@ -180,3 +160,47 @@ const void *stm_interrupt_vector[] = {
 	i(0xb8, cec_can),
 	i(0xbc, usb),
 };
+
+/*
+ * Previous versions of this code had a 256 byte interupt vector. Add
+ * some padding to make sure the other low ROM variables land at the
+ * same address
+ */
+
+__attribute__ ((section(".init.0")))
+const void *const __interrupt_pad[0x10];
+
+void *__interrupt_ram[sizeof(__interrupt_vector)/sizeof(__interrupt_vector[0])] __attribute__((section(".preserve.1")));
+
+extern char __data_source[];
+extern char __data_start[];
+extern char __data_size[];
+extern char __bss_start[];
+extern char __bss_size[];
+
+void _start(void)
+{
+	memcpy(__data_start, __data_source, (uintptr_t) __data_size);
+	memset(__bss_start, '\0', (uintptr_t) __bss_size);
+
+#if AO_BOOT_CHAIN
+	if (ao_boot_check_chain()) {
+#if AO_BOOT_PIN
+		ao_boot_check_pin();
+#endif
+	}
+#endif
+	/* Turn on syscfg */
+	stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_SYSCFGCOMPEN);
+
+#if RELOCATE_INTERRUPT
+	memcpy(__interrupt_ram, __interrupt_vector, sizeof(__interrupt_ram));
+	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);
+#else
+	/* Switch to Main Flash mode (DFU loader leaves us in System mode) */
+	stm_syscfg.cfgr1 = (stm_syscfg.cfgr1 & ~(STM_SYSCFG_CFGR1_MEM_MODE_MASK << STM_SYSCFG_CFGR1_MEM_MODE)) |
+		(STM_SYSCFG_CFGR1_MEM_MODE_MAIN_FLASH << STM_SYSCFG_CFGR1_MEM_MODE);
+#endif
+	main();
+}