From: Keith Packard <keithp@keithp.com>
Date: Mon, 15 May 2017 15:58:21 +0000 (-0700)
Subject: altos/stmf: Fix up serial port flow control configuration bits
X-Git-Tag: 1.8~115
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f132a22995235f3002e4a2bb8771c9b5738efb30

altos/stmf: Fix up serial port flow control configuration bits

Compute whether any sw/hw flow control is in use.
Compute whether hw flow control is in use as a separate value.

These make the code a bit easier to follow.

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

diff --git a/src/stmf0/ao_arch_funcs.h b/src/stmf0/ao_arch_funcs.h
index c38ce41a..01d51f90 100644
--- a/src/stmf0/ao_arch_funcs.h
+++ b/src/stmf0/ao_arch_funcs.h
@@ -310,6 +310,27 @@ void
 ao_i2c_init(void);
 
 /* ao_serial_stm.c */
+
+#if USE_SERIAL_1_FLOW && USE_SERIAL_1_SW_FLOW || USE_SERIAL_2_FLOW && USE_SERIAL_2_SW_FLOW
+#define HAS_SERIAL_SW_FLOW	1
+#else
+#define HAS_SERIAL_SW_FLOW	0
+#endif
+
+#if USE_SERIAL_2_FLOW && !USE_SERIAL_2_SW_FLOW
+#define USE_SERIAL_2_HW_FLOW	1
+#endif
+
+#if USE_SERIAL_1_FLOW && !USE_SERIAL_1_SW_FLOW
+#define USE_SERIAL_1_HW_FLOW	1
+#endif
+
+#if USE_SERIAL_1_HW_FLOW || USE_SERIAL_2_HW_FLOW
+#define HAS_SERIAL_HW_FLOW	1
+#else
+#define HAS_SERIAL_HW_FLOW	0
+#endif
+
 struct ao_stm_usart {
 	struct ao_fifo		rx_fifo;
 	struct ao_fifo		tx_fifo;
diff --git a/src/stmf0/ao_exti.h b/src/stmf0/ao_exti.h
index 7452af8e..36c3f7ca 100644
--- a/src/stmf0/ao_exti.h
+++ b/src/stmf0/ao_exti.h
@@ -21,6 +21,7 @@
 
 #define AO_EXTI_MODE_RISING	1
 #define AO_EXTI_MODE_FALLING	2
+#define AO_EXTI_MODE_PULL_NONE	0
 #define AO_EXTI_MODE_PULL_UP	4
 #define AO_EXTI_MODE_PULL_DOWN	8
 #define AO_EXTI_PRIORITY_LOW	16
diff --git a/src/stmf0/ao_serial_stm.c b/src/stmf0/ao_serial_stm.c
index 06fc054a..e20b5755 100644
--- a/src/stmf0/ao_serial_stm.c
+++ b/src/stmf0/ao_serial_stm.c
@@ -348,7 +348,7 @@ ao_serial2_set_speed(uint8_t speed)
 	ao_usart_set_speed(&ao_stm_usart2, speed);
 }
 
-#if HAS_SERIAL_SW_FLOW
+#if USE_SERIAL_2_FLOW && USE_SERIAL_2_SW_FLOW
 void
 ao_serial2_cts(void)
 {