projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm32f4: Add -mfloat-abi=hard compile option
[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 2d2c3972defaaeacbf6fd286173c5c6fc0f55d99..46bf0495988dfa82446ab7a49cb8b43cd4cdbc15 100644
(file)
--- a/
src/lpc/ao_led_lpc.c
+++ b/
src/lpc/ao_led_lpc.c
@@
-18,7
+18,7
@@
#include <ao.h>
#include <ao.h>
-
__pdata
AO_PORT_TYPE ao_led_enable;
+AO_PORT_TYPE ao_led_enable;
void
ao_led_on(AO_PORT_TYPE colors)
void
ao_led_on(AO_PORT_TYPE colors)
@@
-35,8
+35,8
@@
ao_led_off(AO_PORT_TYPE colors)
void
ao_led_set(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);
ao_led_off(off);
ao_led_on(on);
@@
-49,7
+49,7
@@
ao_led_toggle(AO_PORT_TYPE colors)
}
void
}
void
-ao_led_for(AO_PORT_TYPE colors,
uint16_t ticks) __reentrant
+ao_led_for(AO_PORT_TYPE colors,
AO_TICK_TYPE ticks)
{
ao_led_on(colors);
ao_delay(ticks);
{
ao_led_on(colors);
ao_delay(ticks);
@@
-57,18
+57,17
@@
ao_led_for(AO_PORT_TYPE colors, uint16_t ticks) __reentrant
}
void
}
void
-ao_led_init(
AO_PORT_TYPE enable
)
+ao_led_init(
void
)
{
{
- ao_led_enable = enable;
ao_enable_port(LED_PORT);
if (LED_PORT == 0) {
ao_enable_port(LED_PORT);
if (LED_PORT == 0) {
- if (
enable
& (1 << 11))
+ if (
LEDS_AVAILABLE
& (1 << 11))
lpc_ioconf.pio0_11 = LPC_IOCONF_FUNC_PIO0_11 | (1 << LPC_IOCONF_ADMODE);
lpc_ioconf.pio0_11 = LPC_IOCONF_FUNC_PIO0_11 | (1 << LPC_IOCONF_ADMODE);
- if (
enable
& (1 << 12))
+ if (
LEDS_AVAILABLE
& (1 << 12))
lpc_ioconf.pio0_12 = LPC_IOCONF_FUNC_PIO0_12 | (1 << LPC_IOCONF_ADMODE);
lpc_ioconf.pio0_12 = LPC_IOCONF_FUNC_PIO0_12 | (1 << LPC_IOCONF_ADMODE);
- if (
enable
& (1 << 14))
+ if (
LEDS_AVAILABLE
& (1 << 14))
lpc_ioconf.pio0_14 = LPC_IOCONF_FUNC_PIO0_14 | (1 << LPC_IOCONF_ADMODE);
}
lpc_ioconf.pio0_14 = LPC_IOCONF_FUNC_PIO0_14 | (1 << LPC_IOCONF_ADMODE);
}
- lpc_gpio.dir[LED_PORT] |=
enable
;
- ao_led_off(
enable
);
+ lpc_gpio.dir[LED_PORT] |=
LEDS_AVAILABLE
;
+ ao_led_off(
LEDS_AVAILABLE
);
}
}