X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_led_lpc.c;h=3a2d4c9886986b72889c50a07c0d13a0ba937cde;hb=6aeb000899ad7f22e92b487b5891664554bc4d33;hp=d983437cd4c4549c0a64886b434d8e61f2aebe7b;hpb=469bd376d84bf8d76faa3b726d96061d4d98b998;p=fw%2Faltos

diff --git a/src/lpc/ao_led_lpc.c b/src/lpc/ao_led_lpc.c
index d983437c..3a2d4c98 100644
--- a/src/lpc/ao_led_lpc.c
+++ b/src/lpc/ao_led_lpc.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,7 +18,7 @@
 
 #include <ao.h>
 
-__pdata AO_PORT_TYPE ao_led_enable;
+AO_PORT_TYPE ao_led_enable;
 
 void
 ao_led_on(AO_PORT_TYPE colors)
@@ -34,8 +35,8 @@ ao_led_off(AO_PORT_TYPE colors)
 void
 ao_led_set(AO_PORT_TYPE colors)
 {
-	AO_PORT_TYPE	on = colors & ao_led_enable;
-	AO_PORT_TYPE	off = ~colors & ao_led_enable;
+	AO_PORT_TYPE	on = colors & LEDS_AVAILABLE;
+	AO_PORT_TYPE	off = ~colors & LEDS_AVAILABLE;
 
 	ao_led_off(off);
 	ao_led_on(on);
@@ -48,7 +49,7 @@ ao_led_toggle(AO_PORT_TYPE colors)
 }
 
 void
-ao_led_for(AO_PORT_TYPE colors, uint16_t ticks) __reentrant
+ao_led_for(AO_PORT_TYPE colors, uint16_t ticks) 
 {
 	ao_led_on(colors);
 	ao_delay(ticks);
@@ -56,9 +57,17 @@ ao_led_for(AO_PORT_TYPE colors, uint16_t ticks) __reentrant
 }
 
 void
-ao_led_init(AO_PORT_TYPE enable)
+ao_led_init(void)
 {
-	ao_led_enable = enable;
-	lpc_scb.sysahbclkctrl |= (1 << LPC_SCB_SYSAHBCLKCTRL_GPIO);
-	lpc_gpio.dir[LED_PORT] |= enable;
+	ao_enable_port(LED_PORT);
+	if (LED_PORT == 0) {
+		if (LEDS_AVAILABLE & (1 << 11))
+			lpc_ioconf.pio0_11 = LPC_IOCONF_FUNC_PIO0_11 | (1 << LPC_IOCONF_ADMODE);
+		if (LEDS_AVAILABLE & (1 << 12))
+			lpc_ioconf.pio0_12 = LPC_IOCONF_FUNC_PIO0_12 | (1 << LPC_IOCONF_ADMODE);
+		if (LEDS_AVAILABLE & (1 << 14))
+			lpc_ioconf.pio0_14 = LPC_IOCONF_FUNC_PIO0_14 | (1 << LPC_IOCONF_ADMODE);
+	}
+	lpc_gpio.dir[LED_PORT] |= LEDS_AVAILABLE;
+	ao_led_off(LEDS_AVAILABLE);
 }