X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_boot_pin.c;h=91acbfd492bc29cddc2cbca1cccc0c27c81784db;hb=94445131d0be72f099985709dda4203259b1d947;hp=51ecc0a9097166f4d71e23a40853cf28c7b01e16;hpb=4ff54bb96f6c00c0c2c7dd32f81403bac331621a;p=fw%2Faltos

diff --git a/src/lpc/ao_boot_pin.c b/src/lpc/ao_boot_pin.c
index 51ecc0a9..91acbfd4 100644
--- a/src/lpc/ao_boot_pin.c
+++ b/src/lpc/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,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);
@@ -35,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;
 }