X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_interrupt.c;h=0d6e450f581b1911e4ae3e3089154c5348ef1577;hp=969e6a0f7b6a23a7433785f114c76765005509bb;hb=HEAD;hpb=0b1797312b34ba2b8121f82605f8d2c419167737

diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index 969e6a0f..0d6e450f 100644
--- a/src/stm/ao_interrupt.c
+++ b/src/stm/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
@@ -21,10 +22,6 @@
 #include <ao_boot.h>
 
 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__;
 
 /* Interrupt functions */
 
@@ -37,22 +34,36 @@ void stm_ignore_isr(void)
 {
 }
 
-const void *stm_interrupt_vector[];
+uint32_t
+stm_flash_size(void) {
+	uint16_t	dev_id = stm_dev_id();
+	uint16_t	kbytes = 0;
 
-void start(void)
-{
-#ifdef AO_BOOT_CHAIN
-	if (ao_boot_check_chain()) {
-#ifdef AO_BOOT_PIN
-		ao_boot_check_pin();
-#endif
+	switch (dev_id) {
+	case 0x416:	/* cat 1 */
+		kbytes = stm_flash_size_medium.f_size;
+		break;
+	case 0x429:	/* cat 2 */
+		kbytes = stm_flash_size_medium.f_size & 0xff;
+		break;
+	case 0x427:	/* cat 3 */
+		kbytes = stm_flash_size_large.f_size;
+		break;
+	case 0x436:	/* cat 4 */
+		switch (stm_flash_size_large.f_size) {
+		case 0:
+			kbytes = 256;
+			break;
+		case 1:
+			kbytes = 384;
+			break;
+		}
+		break;
+	case 0x437:	/* cat 5 */
+		kbytes = stm_flash_size_large.f_size;
+		break;
 	}
-#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();
+	return (uint32_t) kbytes * 1024;
 }
 
 #define STRINGIFY(x) #x
@@ -122,10 +133,19 @@ isr(tim7)
 
 #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__));
+void ao_setup(void) __attribute__((constructor));
+
+/* This must be exactly 256 bytes long so that the configuration data
+ * gets loaded at the right place
+ */
+
+__attribute__ ((section(".init")))
+const void * const __interrupt_vector[64] = {
+	[0] = &__stack,
+	[1] = _start,
 	i(0x08, nmi),
 	i(0x0c, hardfault),
 	i(0x10, memmanage),
@@ -181,3 +201,18 @@ const void *stm_interrupt_vector[] = {
 	i(0xec, tim6),
 	i(0xf0, tim7),
 };
+
+void __attribute__((constructor)) ao_setup(void) {
+#ifdef AO_BOOT_CHAIN
+	if (ao_boot_check_chain()) {
+#ifdef AO_BOOT_PIN
+		if (ao_boot_check_pin())
+#endif
+		{
+			ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+		}
+	}
+#endif
+	/* Set interrupt vector table offset */
+	stm_nvic.vto = (uint32_t) &__interrupt_vector;
+}