X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_serial_stm.c;h=e356b9441c3e4bce2381e07ee1b88556534bf63e;hp=ce33f97e97416eaaf2a9eddfb54ba9f19943cb9e;hb=0e7d1c89fea98eabca738f10cbfebec631be3bb7;hpb=816c6b5d087694a9db9c34cc5ec7671a1487d9b9

diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c
index ce33f97e..e356b944 100644
--- a/src/stm/ao_serial_stm.c
+++ b/src/stm/ao_serial_stm.c
@@ -59,24 +59,11 @@ ao_usart_isr(struct ao_stm_usart *usart, int stdin)
 	}
 }
 
-char
-ao_usart_getchar(struct ao_stm_usart *usart)
-{
-	char c;
-	ao_arch_block_interrupts();
-	while (ao_fifo_empty(usart->rx_fifo))
-		ao_sleep(&usart->rx_fifo);
-	ao_fifo_remove(usart->rx_fifo, c);
-	ao_arch_release_interrupts();
-	return c;
-}
-
 int
-ao_usart_pollchar(struct ao_stm_usart *usart)
+_ao_usart_pollchar(struct ao_stm_usart *usart)
 {
 	int	c;
-	
-	ao_arch_block_interrupts();
+
 	if (ao_fifo_empty(usart->rx_fifo))
 		c = AO_READ_AGAIN;
 	else {
@@ -84,10 +71,26 @@ ao_usart_pollchar(struct ao_stm_usart *usart)
 		ao_fifo_remove(usart->rx_fifo,u);
 		c = u;
 	}
-	ao_arch_release_interrupts();
 	return c;
 }
 
+char
+ao_usart_getchar(struct ao_stm_usart *usart)
+{
+	int c;
+	ao_arch_block_interrupts();
+	while ((c = _ao_usart_pollchar(usart)) == AO_READ_AGAIN)
+		ao_sleep(&usart->rx_fifo);
+	ao_arch_release_interrupts();
+	return (char) c;
+}
+
+static inline uint8_t
+_ao_usart_sleep(struct ao_stm_usart *usart)
+{
+	return ao_sleep(&usart->rx_fifo);
+}
+
 void
 ao_usart_putchar(struct ao_stm_usart *usart, char c)
 {
@@ -182,6 +185,13 @@ ao_usart_init(struct ao_stm_usart *usart)
 	ao_usart_set_speed(usart, AO_SERIAL_SPEED_9600);
 }
 
+void
+ao_usart_set_flow(struct ao_stm_usart *usart)
+{
+	usart->reg->cr3 |= ((1 << STM_USART_CR3_CTSE) |
+			    (1 << STM_USART_CR3_RTSE));
+}
+
 #if HAS_SERIAL_1
 
 struct ao_stm_usart ao_stm_usart1;
@@ -201,9 +211,21 @@ ao_serial1_putchar(char c)
 }
 
 int
-ao_serial1_pollchar(void)
+_ao_serial1_pollchar(void)
 {
-	return ao_usart_pollchar(&ao_stm_usart1);
+	return _ao_usart_pollchar(&ao_stm_usart1);
+}
+
+uint8_t
+_ao_serial1_sleep(void)
+{
+	return _ao_usart_sleep(&ao_stm_usart1);
+}
+
+void
+ao_serial1_drain(void)
+{
+	ao_usart_drain(&ao_stm_usart1);
 }
 
 void
@@ -232,9 +254,21 @@ ao_serial2_putchar(char c)
 }
 
 int
-ao_serial2_pollchar(void)
+_ao_serial2_pollchar(void)
+{
+	return _ao_usart_pollchar(&ao_stm_usart2);
+}
+
+uint8_t
+_ao_serial2_sleep(void)
 {
-	return ao_usart_pollchar(&ao_stm_usart2);
+	return _ao_usart_sleep(&ao_stm_usart2);
+}
+
+void
+ao_serial2_drain(void)
+{
+	ao_usart_drain(&ao_stm_usart2);
 }
 
 void
@@ -263,9 +297,15 @@ ao_serial3_putchar(char c)
 }
 
 int
-ao_serial3_pollchar(void)
+_ao_serial3_pollchar(void)
+{
+	return _ao_usart_pollchar(&ao_stm_usart3);
+}
+
+uint8_t
+_ao_serial3_sleep(void)
 {
-	return ao_usart_pollchar(&ao_stm_usart3);
+	return _ao_usart_sleep(&ao_stm_usart3);
 }
 
 void
@@ -309,7 +349,7 @@ ao_serial_init(void)
 	stm_nvic_set_enable(STM_ISR_USART1_POS);
 	stm_nvic_set_priority(STM_ISR_USART1_POS, 4);
 #if USE_SERIAL_1_STDIN
-	ao_add_stdio(ao_serial1_pollchar,
+	ao_add_stdio(_ao_serial1_pollchar,
 		     ao_serial1_putchar,
 		     NULL);
 #endif
@@ -327,26 +367,36 @@ ao_serial_init(void)
 
 	stm_afr_set(&stm_gpioa, 2, STM_AFR_AF7);
 	stm_afr_set(&stm_gpioa, 3, STM_AFR_AF7);
+#if USE_SERIAL_2_FLOW
+	stm_afr_set(&stm_gpioa, 0, STM_AFR_AF7);
+	stm_afr_set(&stm_gpioa, 1, STM_AFR_AF7);
+#endif
 #else
 #if SERIAL_2_PD5_PD6
 	stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIODEN);
 
 	stm_afr_set(&stm_gpiod, 5, STM_AFR_AF7);
 	stm_afr_set(&stm_gpiod, 6, STM_AFR_AF7);
+#if USE_SERIAL_2_FLOW
+#error "Don't know how to set flowcontrol for serial 2 on PD"
+#endif
 #else
 #error "No SERIAL_2 port configuration specified"
-#endif	
+#endif
 #endif
 	/* Enable USART */
 	stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_USART2EN);
 
 	ao_stm_usart2.reg = &stm_usart2;
 	ao_usart_init(&ao_stm_usart2);
+#if USE_SERIAL_2_FLOW
+	ao_usart_set_flow(&ao_stm_usart2);
+#endif
 
 	stm_nvic_set_enable(STM_ISR_USART2_POS);
 	stm_nvic_set_priority(STM_ISR_USART2_POS, 4);
 #if USE_SERIAL_2_STDIN
-	ao_add_stdio(ao_serial2_pollchar,
+	ao_add_stdio(_ao_serial2_pollchar,
 		     ao_serial2_putchar,
 		     NULL);
 #endif
@@ -390,11 +440,9 @@ ao_serial_init(void)
 	stm_nvic_set_enable(STM_ISR_USART3_POS);
 	stm_nvic_set_priority(STM_ISR_USART3_POS, 4);
 #if USE_SERIAL_3_STDIN
-	ao_add_stdio(ao_serial3_pollchar,
+	ao_add_stdio(_ao_serial3_pollchar,
 		     ao_serial3_putchar,
 		     NULL);
 #endif
 #endif
 }
-
-