altos: Remove 8051 address space specifiers

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

diff --git a/src/lpc/ao_interrupt.c b/src/lpc/ao_interrupt.c
index b5e67007f0919458480f378438a6a70810583b97..8d71f43f2de38c1f0216d17d18d14b02e82e9559 100644 (file)
--- a/src/lpc/ao_interrupt.c
+++ b/src/lpc/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
@@ -17,12 +18,25 @@
 
 #include <ao.h>
 #include <string.h>
+#include <ao_boot.h>
+
+#ifndef IS_FLASH_LOADER
+#error Should define IS_FLASH_LOADER
+#define IS_FLASH_LOADER        0
+#endif
+
+#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 _start__, _end__;
 extern char __bss_start__, __bss_end__;
+#if RELOCATE_INTERRUPT
+extern char __interrupt_rom__, __interrupt_start__, __interrupt_end__;
+#endif
 
 /* Interrupt functions */
 
@@ -35,11 +49,19 @@ void lpc_ignore_isr(void)
 {
 }
 
-int x;
-
 void start(void) {
-       x = 0;
-       memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
+#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__);
+       lpc_scb.sysmemremap = LPC_SCB_SYSMEMREMAP_MAP_RAM << LPC_SCB_SYSMEMREMAP_MAP;
+#endif
+       memcpy(&_start__, &__text_end__, &_end__ - &_start__);
        memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
        main();
 }
@@ -151,5 +173,5 @@ const void *lpc_interrupt_vector[] = {
        i(0xb0, hardfault),     /* IRQ28 */
        i(0xb4, hardfault),
        i(0xb8, usb_wakeup),
-       i(0xbc, hardfault),     
+       i(0xbc, hardfault),
 };