Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

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

diff --git a/src/lpc/ao_boot_pin.c b/src/lpc/ao_boot_pin.c
index e3c7d0c16d3d19e292fe8c1386f8af22c534e5d9..91acbfd492bc29cddc2cbca1cccc0c27c81784db 100644 (file)
--- a/src/lpc/ao_boot_pin.c
+++ b/src/lpc/ao_boot_pin.c
@@ -20,14 +20,11 @@
 #include <ao_boot.h>
 #include <ao_exti.h>
 
-void
+int
 ao_boot_check_pin(void)
 {
        uint16_t v;
 
-       /* 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);
@@ -36,12 +33,10 @@ ao_boot_check_pin(void)
                ao_arch_nop();
 
        /* Read the value */
-       v = ao_gpio_get(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, AO_BOOT_APPLICATION);
+       v = ao_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(AO_BOOT_APPLICATION_BASE);
+       return v == AO_BOOT_APPLICATION_VALUE;
 }