X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_led.c;h=ee313b6fa5b8e16b9dd83f9cdea9a937326d1965;hb=a07b8ba166e05e7d1722c59651ef00e9fb7580d5;hp=0574aa2a087ce33bb46831f1bbdfc0aa8d599d3e;hpb=4be74ef0d13114707fd8217907a5ec457f886160;p=fw%2Faltos

diff --git a/src/stm/ao_led.c b/src/stm/ao_led.c
index 0574aa2a..ee313b6f 100644
--- a/src/stm/ao_led.c
+++ b/src/stm/ao_led.c
@@ -17,34 +17,37 @@
 
 #include "ao.h"
 
-__pdata uint8_t ao_led_enable;
+__pdata uint16_t ao_led_enable;
 
 void
-ao_led_on(uint8_t colors)
+ao_led_on(uint16_t colors)
 {
-	LED_PORT.odr |= (colors & ao_led_enable);
+	LED_PORT->bsrr = (colors & ao_led_enable);
 }
 
 void
-ao_led_off(uint8_t colors)
+ao_led_off(uint16_t colors)
 {
-	LED_PORT.odr &= ~(colors & ao_led_enable);
+	LED_PORT->bsrr = (uint32_t) (colors & ao_led_enable) << 16;
 }
 
 void
-ao_led_set(uint8_t colors)
+ao_led_set(uint16_t colors)
 {
-	LED_PORT.odr = (LED_PORT.odr & ~(ao_led_enable)) | (colors & ao_led_enable);
+	uint16_t	on = colors & ao_led_enable;
+	uint16_t	off = ~colors & ao_led_enable;
+
+	LED_PORT->bsrr = off << 16 | on;
 }
 
 void
-ao_led_toggle(uint8_t colors)
+ao_led_toggle(uint16_t colors)
 {
-	LED_PORT.odr ^= (colors & ao_led_enable);
+	LED_PORT->odr ^= (colors & ao_led_enable);
 }
 
 void
-ao_led_for(uint8_t colors, uint16_t ticks) __reentrant
+ao_led_for(uint16_t colors, uint16_t ticks) __reentrant
 {
 	ao_led_on(colors);
 	ao_delay(ticks);
@@ -52,17 +55,17 @@ ao_led_for(uint8_t colors, uint16_t ticks) __reentrant
 }
 
 void
-ao_led_init(uint8_t enable)
+ao_led_init(uint16_t enable)
 {
 	int	bit;
 
 	stm_rcc.ahbenr |= (1 << LED_PORT_ENABLE);
 	ao_led_enable = enable;
-	LED_PORT.odr &= ~enable;
+	LED_PORT->odr &= ~enable;
 	for (bit = 0; bit < 16; bit++) {
 		if (enable & (1 << bit)) {
-			stm_moder_set(&LED_PORT, bit, STM_MODER_OUTPUT);
-			stm_otyper_set(&LED_PORT, bit, STM_OTYPER_PUSH_PULL);
+			stm_moder_set(LED_PORT, bit, STM_MODER_OUTPUT);
+			stm_otyper_set(LED_PORT, bit, STM_OTYPER_PUSH_PULL);
 		}
 	}
 }