altos: Mark local functions 'static'

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

diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index 9e7562193c37d1567b11ef5fd1d8ed56ad5671cf..a98d799a4a2382a62e6e8dbac67a12b2c952f362 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
@@ -18,90 +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)
 {
 }
 
 const void *stm_interrupt_vector[];
 
-#define BOOT_FETCH(o)  (*((uint32_t *) (AO_BOOT_APPLICATION_BASE + (o))))
-
-#ifdef AO_BOOT_APPLICATION_PIN
-#include <ao_exti.h>
-
-#define AO_BOOT_APPLICATION            0x5a5aa5a5
-#define AO_BOOT_APPLICATION_CHECK      0xc3c33c3c
-
-static uint32_t        ao_boot_application;
-static uint32_t        ao_boot_application_check;
-
-static void
-ao_boot_chain(void) {
-       uint32_t        sp;
-       uint32_t        pc;
-
-       sp = BOOT_FETCH(0);
-       pc = BOOT_FETCH(4);
-       asm ("mov sp, %0" : : "r" (sp));
-       asm ("mov lr, %0" : : "r" (pc));
-       asm ("bx lr");
+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
-ao_reboot_application(void)
+void start(void)
 {
-       ao_boot_application = AO_BOOT_APPLICATION;
-       ao_boot_application_check = AO_BOOT_APPLICATION_CHECK;
-       ao_arch_reboot();
-}
-
+#ifdef AO_BOOT_CHAIN
+       if (ao_boot_check_chain()) {
+#ifdef AO_BOOT_PIN
+               ao_boot_check_pin();
 #endif
-
-void start(void) {
-#ifdef AO_BOOT_APPLICATION_PIN
-       uint16_t v;
-
-       if (ao_boot_application == AO_BOOT_APPLICATION &&
-           ao_boot_application_check == AO_BOOT_APPLICATION_CHECK) {
-               ao_boot_application = 0;
-               ao_boot_application_check = 0;
-               ao_boot_chain();
        }
-       /* Enable power interface clock */
-       stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_PWREN);
-       
-       /* Enable the input pin */
-       ao_enable_input(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN,
-                       AO_BOOT_APPLICATION_MODE);
-
-       /* Read the value */
-       v = stm_gpio_get(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN);
-
-       /* Reset the chip to turn off the port and the power interface clock */
-       ao_gpio_set_mode(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
-       ao_disable_port(&AO_BOOT_APPLICATION_GPIO);
-       stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_PWREN);
-       if (v == AO_BOOT_APPLICATION_VALUE)
-               ao_boot_chain();
 #endif
-
        /* Set interrupt vector table offset */
        stm_nvic.vto = (uint32_t) &stm_interrupt_vector;
-       memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
+       memcpy(&_start__, &__text_end__, &_end__ - &_start__);
        memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
        main();
 }