X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_boot_pin.c;h=4b5dc2ac480341086e4264284b9345d2e5da299c;hb=refs%2Fheads%2Fmaster;hp=1000a65a8c1e361728b9e024ae3d3f67f6357976;hpb=ecb128579e7576fc27c8ca93708f316b9ac91630;p=fw%2Faltos diff --git a/src/stm/ao_boot_pin.c b/src/stm/ao_boot_pin.c index 1000a65a..b289b804 100644 --- a/src/stm/ao_boot_pin.c +++ b/src/stm/ao_boot_pin.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 @@ -19,14 +20,14 @@ #include #include -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); @@ -40,7 +41,6 @@ ao_boot_check_pin(void) /* 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); + stm_rcc.apb1enr &= ~(1UL << STM_RCC_APB1ENR_PWREN); + return v == AO_BOOT_APPLICATION_VALUE; }