X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_interrupt.c;h=a98d799a4a2382a62e6e8dbac67a12b2c952f362;hp=a423d8b13b1f76ad4ab2524602da956e8a74eadb;hb=c11427819ca24bb77523496309b5b6f699d126c5;hpb=282f0451dd141db3304ab73e4020a849e59721eb

diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index a423d8b1..a98d799a 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
@@ -18,26 +19,71 @@
 #include <ao.h>
 #include "stm32l.h"
 #include <string.h>
+#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 _start__, _end__;
 extern char __bss_start__, __bss_end__;
 
 /* Interrupt functions */
 
-void stm_halt_isr(void)
+static void stm_halt_isr(void)
 {
 	ao_panic(AO_PANIC_CRASH);
 }
 
-void stm_ignore_isr(void)
+static void stm_ignore_isr(void)
 {
 }
 
-void start(void) {
-	memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
+const void *stm_interrupt_vector[];
+
+uint32_t
+stm_flash_size(void) {
+	uint16_t	dev_id = stm_dev_id();
+	uint16_t	kbytes = 0;
+
+	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;
+	}
+	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
+	/* Set interrupt vector table offset */
+	stm_nvic.vto = (uint32_t) &stm_interrupt_vector;
+	memcpy(&_start__, &__text_end__, &_end__ - &_start__);
 	memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
 	main();
 }