first cut at turnon scripts for EasyTimer v2

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

diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index 56cce0c02ff90af23fac42ee05af44783b59626c..0d6e450f581b1911e4ae3e3089154c5348ef1577 100644 (file)
--- 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,8 +34,6 @@ void stm_ignore_isr(void)
 {
 }
 
-const void *stm_interrupt_vector[];
-
 uint32_t
 stm_flash_size(void) {
        uint16_t        dev_id = stm_dev_id();
@@ -71,22 +66,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
-       /* 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();
-}
-
 #define STRINGIFY(x) #x
 
 #define isr(name) \
@@ -154,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),
@@ -213,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;
+}