X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_serial_stm.c;h=2133c5845e0ca33233332ffc7717ad87ab49b6be;hp=a8c102227f7613ae4eb4892bdbebd12229a31106;hb=2fa87754c5c11bb86e9b1878580c3d4f4b2463f5;hpb=d7ddfd4e6d75e50ca64a342181f5c52e9f4919af

diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c
index a8c10222..2133c584 100644
--- a/src/stm/ao_serial_stm.c
+++ b/src/stm/ao_serial_stm.c
@@ -17,13 +17,6 @@
 
 #include <ao.h>
 
-struct ao_stm_usart {
-	struct ao_fifo		rx_fifo;
-	struct ao_fifo		tx_fifo;
-	struct stm_usart	*reg;
-	uint8_t			tx_started;
-};
-
 void
 ao_debug_out(char c)
 {
@@ -34,7 +27,7 @@ ao_debug_out(char c)
 }
 
 static void
-ao_usart_tx_start(struct ao_stm_usart *usart)
+_ao_usart_tx_start(struct ao_stm_usart *usart)
 {
 	if (!ao_fifo_empty(usart->tx_fifo) && !usart->tx_started)
 	{
@@ -61,80 +54,83 @@ ao_usart_isr(struct ao_stm_usart *usart, int stdin)
 	}
 	if (sr & (1 << STM_USART_SR_TC)) {
 		usart->tx_started = 0;
-		ao_usart_tx_start(usart);
+		_ao_usart_tx_start(usart);
 		ao_wakeup(&usart->tx_fifo);
 	}
 }
 
-char
-ao_usart_getchar(struct ao_stm_usart *usart)
+int
+_ao_usart_pollchar(struct ao_stm_usart *usart)
 {
-	char c;
-	cli();
-	while (ao_fifo_empty(usart->rx_fifo))
-		ao_sleep(&usart->rx_fifo);
-	ao_fifo_remove(usart->rx_fifo, c);
-	sei();
+	int	c;
+	
+	if (ao_fifo_empty(usart->rx_fifo))
+		c = AO_READ_AGAIN;
+	else {
+		uint8_t	u;
+		ao_fifo_remove(usart->rx_fifo,u);
+		c = u;
+	}
 	return c;
 }
 
 char
-ao_usart_pollchar(struct ao_stm_usart *usart)
+ao_usart_getchar(struct ao_stm_usart *usart)
 {
-	char	c;
-	cli();
-	if (ao_fifo_empty(usart->rx_fifo)) {
-		sei();
-		return AO_READ_AGAIN;
-	}
-	ao_fifo_remove(usart->rx_fifo,c);
-	sei();
-	return c;
+	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;
 }
 
 void
 ao_usart_putchar(struct ao_stm_usart *usart, char c)
 {
-	cli();
+	ao_arch_block_interrupts();
 	while (ao_fifo_full(usart->tx_fifo))
 		ao_sleep(&usart->tx_fifo);
 	ao_fifo_insert(usart->tx_fifo, c);
-	ao_usart_tx_start(usart);
-	sei();
+	_ao_usart_tx_start(usart);
+	ao_arch_release_interrupts();
 }
 
 void
 ao_usart_drain(struct ao_stm_usart *usart)
 {
-	cli();
+	ao_arch_block_interrupts();
 	while (!ao_fifo_empty(usart->tx_fifo))
 		ao_sleep(&usart->tx_fifo);
-	sei();
+	ao_arch_release_interrupts();
 }
 
 static const struct {
 	uint32_t brr;
 } ao_usart_speeds[] = {
 	[AO_SERIAL_SPEED_4800] = {
-		STM_APB1 / 4800
+		AO_PCLK1 / 4800
 	},
 	[AO_SERIAL_SPEED_9600] = {
-		STM_APB1 / 9600
+		AO_PCLK1 / 9600
 	},
 	[AO_SERIAL_SPEED_19200] = {
-		STM_APB1 / 19200
+		AO_PCLK1 / 19200
 	},
 	[AO_SERIAL_SPEED_57600] = {
-		STM_APB1 / 57600
+		AO_PCLK1 / 57600
+	},
+	[AO_SERIAL_SPEED_115200] = {
+		AO_PCLK1 / 115200
 	},
 };
 
 void
 ao_usart_set_speed(struct ao_stm_usart *usart, uint8_t speed)
 {
-	if (speed > AO_SERIAL_SPEED_57600)
+	if (speed > AO_SERIAL_SPEED_115200)
 		return;
-	stm_usart1.brr = ao_usart_speeds[speed].brr;
+	usart->reg->brr = ao_usart_speeds[speed].brr;
 }
 
 void
@@ -201,10 +197,10 @@ ao_serial1_putchar(char c)
 	ao_usart_putchar(&ao_stm_usart1, c);
 }
 
-char
-ao_serial1_pollchar(void)
+int
+_ao_serial1_pollchar(void)
 {
-	return ao_usart_pollchar(&ao_stm_usart1);
+	return _ao_usart_pollchar(&ao_stm_usart1);
 }
 
 void
@@ -232,10 +228,10 @@ ao_serial2_putchar(char c)
 	ao_usart_putchar(&ao_stm_usart2, c);
 }
 
-char
-ao_serial2_pollchar(void)
+int
+_ao_serial2_pollchar(void)
 {
-	return ao_usart_pollchar(&ao_stm_usart2);
+	return _ao_usart_pollchar(&ao_stm_usart2);
 }
 
 void
@@ -249,7 +245,7 @@ ao_serial2_set_speed(uint8_t speed)
 
 struct ao_stm_usart ao_stm_usart3;
 
-void stm_usart3_isr(void) { ao_usart_isr(&ao_stm_usart3, USE_SERIAL_3_STDIN); }
+void stm_usart3_isr(void) { ao_usart_isr(&ao_stm_usart3, USE_SERIAL_2_STDIN); }
 
 char
 ao_serial3_getchar(void)
@@ -263,10 +259,10 @@ ao_serial3_putchar(char c)
 	ao_usart_putchar(&ao_stm_usart3, c);
 }
 
-char
-ao_serial3_pollchar(void)
+int
+_ao_serial3_pollchar(void)
 {
-	return ao_usart_pollchar(&ao_stm_usart3);
+	return _ao_usart_pollchar(&ao_stm_usart3);
 }
 
 void
@@ -303,14 +299,14 @@ ao_serial_init(void)
 #endif
 	/* Enable USART */
 	stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_USART1EN);
-	ao_stm_usart1.reg = &stm_usart1;
 
+	ao_stm_usart1.reg = &stm_usart1;
 	ao_usart_init(&ao_stm_usart1);
 
 	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
@@ -347,7 +343,7 @@ ao_serial_init(void)
 	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
@@ -382,7 +378,6 @@ ao_serial_init(void)
 #endif
 #endif
 #endif
-	
 	/* Enable USART */
 	stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_USART3EN);
 
@@ -392,7 +387,7 @@ 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