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

diff --git a/src/stm/ao_led.c b/src/stm/ao_led.c
index 0574aa2a..0f39befb 100644
--- a/src/stm/ao_led.c
+++ b/src/stm/ao_led.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
@@ -17,52 +18,109 @@
 
 #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);
+#ifdef LED_PORT
+	LED_PORT->bsrr = (colors & ao_led_enable);
+#else
+#ifdef LED_PORT_0
+	LED_PORT_0->bsrr = ((colors & ao_led_enable) & LED_PORT_0_MASK) << LED_PORT_0_SHIFT;
+#endif
+#ifdef LED_PORT_1
+	LED_PORT_1->bsrr = ((colors & ao_led_enable) & LED_PORT_1_MASK) << LED_PORT_1_SHIFT;
+#endif
+#endif
 }
 
 void
-ao_led_off(uint8_t colors)
+ao_led_off(uint16_t colors)
 {
-	LED_PORT.odr &= ~(colors & ao_led_enable);
+#ifdef LED_PORT
+	LED_PORT->bsrr = (uint32_t) (colors & ao_led_enable) << 16;
+#else
+#ifdef LED_PORT_0
+	LED_PORT_0->bsrr = ((uint32_t) (colors & ao_led_enable) & LED_PORT_0_MASK) << (LED_PORT_0_SHIFT + 16);
+#endif
+#ifdef LED_PORT_1
+	LED_PORT_1->bsrr = ((uint32_t) (colors & ao_led_enable) & LED_PORT_1_MASK) << (LED_PORT_1_SHIFT + 16);
+#endif
+#endif
 }
 
 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;
+
+	ao_led_off(off);
+	ao_led_on(on);
 }
 
 void
-ao_led_toggle(uint8_t colors)
+ao_led_toggle(uint16_t colors)
 {
-	LED_PORT.odr ^= (colors & ao_led_enable);
+#ifdef LED_PORT
+	LED_PORT->odr ^= (colors & ao_led_enable);
+#else
+#ifdef LED_PORT_0
+	LED_PORT_0->odr ^= ((colors & ao_led_enable) & LED_PORT_0_MASK) << LED_PORT_0_SHIFT;
+#endif
+#ifdef LED_PORT_1
+	LED_PORT_1->odr ^= ((colors & ao_led_enable) & LED_PORT_1_MASK) << LED_PORT_1_SHIFT;
+#endif
+#endif
 }
 
 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);
 	ao_led_off(colors);
 }
 
+#define init_led_pin(port, bit) do { \
+		stm_moder_set(port, bit, STM_MODER_OUTPUT);		\
+		stm_otyper_set(port, bit, STM_OTYPER_PUSH_PULL);	\
+	} while (0)
+
 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;
+#ifdef LED_PORT
+	stm_rcc.ahbenr |= (1 << LED_PORT_ENABLE);
+	LED_PORT->odr &= ~enable;
+#else
+#ifdef LED_PORT_0
+	stm_rcc.ahbenr |= (1 << LED_PORT_0_ENABLE);
+	LED_PORT_0->odr &= ~((enable & ao_led_enable) & LED_PORT_0_MASK) << LED_PORT_0_SHIFT;
+#endif
+#ifdef LED_PORT_1
+	stm_rcc.ahbenr |= (1 << LED_PORT_1_ENABLE);
+	LED_PORT_1->odr &= ~((enable & ao_led_enable) & LED_PORT_1_MASK) << LED_PORT_1_SHIFT;
+#endif
+#endif
 	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);
+#ifdef LED_PORT
+			init_led_pin(LED_PORT, bit);
+#else
+#ifdef LED_PORT_0
+			if (LED_PORT_0_MASK & (1 << bit))
+				init_led_pin(LED_PORT_0, bit + LED_PORT_0_SHIFT);
+#endif
+#ifdef LED_PORT_1
+			if (LED_PORT_1_MASK & (1 << bit))
+				init_led_pin(LED_PORT_1, bit + LED_PORT_1_SHIFT);
+#endif
+#endif
 		}
 	}
 }