X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_pca9922.c;h=91d62026712deb1f7f7b6a8e3866ea52e2c9c106;hp=dc006f55eaf47311a3a1025b821b0cb5f2e3c522;hb=0686a7b8aec524d81bda4c572549a3a068ce0eed;hpb=4d4ad34aec0c75c66162b992f1e52947e4685730

diff --git a/src/drivers/ao_pca9922.c b/src/drivers/ao_pca9922.c
index dc006f55..91d62026 100644
--- a/src/drivers/ao_pca9922.c
+++ b/src/drivers/ao_pca9922.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
@@ -22,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)
@@ -30,9 +31,12 @@ ao_led_apply(void)
 	/* Don't try the SPI bus during initialization */
 	if (!ao_cur_task)
 		return;
-	ao_spi_get_bit(AO_PCA9922_CS_PORT, AO_PCA9922_CS_PIN, AO_PCA9922_CS, AO_PCA9922_SPI_BUS, AO_SPI_SPEED_FAST);
+	ao_spi_get(AO_PCA9922_SPI_BUS);
+	ao_spi_set_speed(AO_PCA9922_SPI_BUS,AO_SPI_SPEED_FAST);
+	AO_PCA9922_CS = 1;
 	ao_spi_send(&ao_led_state, 1, AO_PCA9922_SPI_BUS);
-	ao_spi_put_bit(AO_PCA9922_CS_PORT, AO_PCA9922_CS_PIN, AO_PCA9922_CS, AO_PCA9922_SPI_BUS);
+	AO_PCA9922_CS = 0;
+	ao_spi_put(AO_PCA9922_SPI_BUS);
 }
 
 void
@@ -56,6 +60,31 @@ ao_led_set(uint8_t colors)
 	ao_led_apply();
 }
 
+void
+ao_led_set_mask(uint8_t colors, uint8_t mask)
+{
+	ao_led_state = (ao_led_state & ~mask) | (colors & mask);
+	ao_led_apply();
+}
+
+#define LED_TEST	1
+#if LED_TEST
+static void
+ao_led_test(void)
+{
+	AO_LED_TYPE r = ao_cmd_hexbyte();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	ao_led_set(r);
+	printf("LEDs set to %x\n", r);
+}
+
+static const struct ao_cmds ao_led_cmds[] = {
+	{ ao_led_test,	"l <value>\0Set LEDs to <value>" },
+	{ 0, NULL }
+};
+#endif
+
 void
 ao_led_toggle(uint8_t colors)
 {
@@ -64,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);
@@ -74,5 +103,9 @@ ao_led_for(uint8_t colors, uint16_t ticks) __reentrant
 void
 ao_led_init(uint8_t enable)
 {
+	(void) enable;
 	ao_enable_output(AO_PCA9922_CS_PORT, AO_PCA9922_CS_PIN, AO_PCA9922_CS, 1);
+#if LED_TEST
+	ao_cmd_register(&ao_led_cmds[0]);
+#endif
 }