From: Keith Packard <keithp@keithp.com>
Date: Sat, 21 Apr 2018 23:16:18 +0000 (-0700)
Subject: altos/fox1ihu: Pull down radio control pin in flash loader
X-Git-Tag: 1.8.6~1^2~77
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=0dfaecc25a12da57248541a66dd5118161616cce

altos/fox1ihu: Pull down radio control pin in flash loader

Ensures that the radio is powered down while in the flash loader.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/fox1ihu/flash-loader/ao_pins.h b/src/fox1ihu/flash-loader/ao_pins.h
index 31201eb0..19f29b08 100644
--- a/src/fox1ihu/flash-loader/ao_pins.h
+++ b/src/fox1ihu/flash-loader/ao_pins.h
@@ -22,16 +22,27 @@
 #define AO_HSE		8000000
 
 #define AO_WATCHDOG_PORT	(&stm_gpiod)
+#define AO_WATCHDOG_PORT_BIT	(1 << STM_RCC_AHBENR_GPIODEN)
 #define AO_WATCHDOG_BIT		3
-
-#define AO_FLASH_LOADER_INIT do {						\
-		ao_enable_output(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, AO_WATCHDOG, 0); \
+#define AO_WATCHDOG_VALUE	0
+
+#define AO_RADIO_CONTROL_PORT		(&stm_gpioe)
+#define AO_RADIO_CONTROL_PORT_BIT	(1 << STM_RCC_AHBENR_GPIOEEN)
+#define AO_RADIO_CONTROL_BIT		12
+#define AO_RADIO_CONTROL_VALUE		1
+
+#define AO_FLASH_LOADER_INIT do {					\
+		stm_rcc.ahbenr |= AO_WATCHDOG_PORT_BIT | AO_RADIO_CONTROL_PORT_BIT; \
+									\
+		stm_gpio_set(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, AO_WATCHDOG_VALUE); \
+		stm_moder_set(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, STM_MODER_OUTPUT); \
+									\
+		stm_gpio_set(AO_RADIO_CONTROL_PORT, AO_RADIO_CONTROL_BIT, AO_RADIO_CONTROL_VALUE); \
+		stm_moder_set(AO_RADIO_CONTROL_PORT, AO_RADIO_CONTROL_BIT, STM_MODER_OUTPUT); \
 	} while (0)
-	
+
 #define AO_TIMER_HOOK	do {						\
-		static uint8_t	watchdog;				\
-		ao_gpio_set(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, AO_WATCHDOG_PIN, watchdog); \
-		watchdog ^= 1;						\
+		AO_WATCHDOG_PORT->odr ^= (1 << AO_WATCHDOG_BIT);	\
 	} while (0)
 
 #define HAS_TICK		1