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

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

diff --git a/src/lpc/ao_led_lpc.c b/src/lpc/ao_led_lpc.c
index 7bef51ba25cdce0e07b05b0bae002395fc940d66..a0b293b923a8a3b39a683f7566a49da0cb35fabd 100644 (file)
--- a/src/lpc/ao_led_lpc.c
+++ b/src/lpc/ao_led_lpc.c
@@ -17,38 +17,38 @@
 
 #include <ao.h>
 
-__pdata uint16_t ao_led_enable;
+__pdata AO_PORT_TYPE ao_led_enable;
 
 void
-ao_led_on(uint16_t colors)
+ao_led_on(AO_PORT_TYPE colors)
 {
        lpc_gpio.pin[LED_PORT] |= colors;
 }
 
 void
-ao_led_off(uint16_t colors)
+ao_led_off(AO_PORT_TYPE colors)
 {
        lpc_gpio.pin[LED_PORT] &= ~colors;
 }
 
 void
-ao_led_set(uint16_t colors)
+ao_led_set(AO_PORT_TYPE colors)
 {
-       uint16_t        on = colors & ao_led_enable;
-       uint16_t        off = ~colors & ao_led_enable;
+       AO_PORT_TYPE    on = colors & ao_led_enable;
+       AO_PORT_TYPE    off = ~colors & ao_led_enable;
 
        ao_led_off(off);
        ao_led_on(on);
 }
 
 void
-ao_led_toggle(uint16_t colors)
+ao_led_toggle(AO_PORT_TYPE colors)
 {
        lpc_gpio.pin[LED_PORT] ^= colors;
 }
 
 void
-ao_led_for(uint16_t colors, uint16_t ticks) __reentrant
+ao_led_for(AO_PORT_TYPE colors, uint16_t ticks) __reentrant
 {
        ao_led_on(colors);
        ao_delay(ticks);
@@ -56,11 +56,18 @@ ao_led_for(uint16_t colors, uint16_t ticks) __reentrant
 }
 
 void
-ao_led_init(uint16_t enable)
+ao_led_init(AO_PORT_TYPE enable)
 {
-       int     bit;
-
        ao_led_enable = enable;
-       lpc_scb.sysahbclkctrl |= (1 << LPC_SCB_SYSAHBCLKCTRL_GPIO);
+       ao_enable_port(LED_PORT);
+       if (LED_PORT == 0) {
+               if (enable & (1 << 11))
+                       lpc_ioconf.pio0_11 = LPC_IOCONF_FUNC_PIO0_11 | (1 << LPC_IOCONF_ADMODE);
+               if (enable & (1 << 12))
+                       lpc_ioconf.pio0_12 = LPC_IOCONF_FUNC_PIO0_12 | (1 << LPC_IOCONF_ADMODE);
+               if (enable & (1 << 14))
+                       lpc_ioconf.pio0_14 = LPC_IOCONF_FUNC_PIO0_14 | (1 << LPC_IOCONF_ADMODE);
+       }
        lpc_gpio.dir[LED_PORT] |= enable;
+       ao_led_off(enable);
 }