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

[fw/altos] / src / drivers / ao_pca9922.c

diff --git a/src/drivers/ao_pca9922.c b/src/drivers/ao_pca9922.c
index 09f52a0e4968ccf362d01b17164a69cd9c0792f3..91d62026712deb1f7f7b6a8e3866ea52e2c9c106 100644 (file)
--- a/src/drivers/ao_pca9922.c
+++ b/src/drivers/ao_pca9922.c
@@ -23,7 +23,7 @@
 
 #include <ao.h>
 
-static __xdata uint8_t ao_led_state;
+static uint8_t ao_led_state;
 
 static void
 ao_led_apply(void)
@@ -72,11 +72,11 @@ ao_led_set_mask(uint8_t colors, uint8_t mask)
 static void
 ao_led_test(void)
 {
-       ao_cmd_hexbyte();
+       AO_LED_TYPE r = ao_cmd_hexbyte();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       ao_led_set(ao_cmd_lex_i);
-       printf("LEDs set to %02x\n", ao_cmd_lex_i);
+       ao_led_set(r);
+       printf("LEDs set to %x\n", r);
 }
 
 static const struct ao_cmds ao_led_cmds[] = {
@@ -93,7 +93,7 @@ ao_led_toggle(uint8_t colors)
 }
 
 void
-ao_led_for(uint8_t colors, uint16_t ticks) __reentrant
+ao_led_for(uint8_t colors, uint16_t ticks) 
 {
        ao_led_on(colors);
        ao_delay(ticks);