altos: Use TXE instead of TC for serial on STM32l

[fw/altos] / src / stm / ao_serial_stm.c

diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c
index 2568cf430fe5cb92eccc751ae463d2e8c8ccf796..e7b6ab78d71acfa79b3724c0e8379825b337e312 100644 (file)
--- a/src/stm/ao_serial_stm.c
+++ b/src/stm/ao_serial_stm.c
@@ -26,14 +26,19 @@ ao_debug_out(char c)
        stm_usart1.dr = c;
 }
 
-static void
+static int
 _ao_usart_tx_start(struct ao_stm_usart *usart)
 {
        if (!ao_fifo_empty(usart->tx_fifo) && !usart->tx_started)
        {
                usart->tx_started = 1;
+               usart->tx_running = 1;
+               usart->reg->cr1 |= (1 << STM_USART_CR1_TXEIE) | (1 << STM_USART_CR1_TCIE);
                ao_fifo_remove(usart->tx_fifo, usart->reg->dr);
+               ao_wakeup(&usart->tx_fifo);
+               return 1;
        }
+       return 0;
 }
 
 static void
@@ -52,10 +57,18 @@ ao_usart_isr(struct ao_stm_usart *usart, int stdin)
                if (stdin)
                        ao_wakeup(&ao_stdin_ready);
        }
-       if (sr & (1 << STM_USART_SR_TC)) {
+       if (sr & (1 << STM_USART_SR_TXE)) {
                usart->tx_started = 0;
-               _ao_usart_tx_start(usart);
-               ao_wakeup(&usart->tx_fifo);
+               if (!_ao_usart_tx_start(usart))
+                       usart->reg->cr1 &= ~(1<< STM_USART_CR1_TXEIE);
+       }
+       if (sr & (1 << STM_USART_SR_TC)) {
+               usart->tx_running = 0;
+               usart->reg->cr1 &= ~(1 << STM_USART_CR1_TCIE);
+               if (usart->draining) {
+                       usart->draining = 0;
+                       ao_wakeup(&usart->tx_fifo);
+               }
        }
 }
 
@@ -70,6 +83,7 @@ _ao_usart_pollchar(struct ao_stm_usart *usart)
                uint8_t u;
                ao_fifo_remove(usart->rx_fifo,u);
                c = u;
+               ao_usb_putchar(c); ao_usb_flush();
        }
        return c;
 }
@@ -82,18 +96,20 @@ ao_usart_getchar(struct ao_stm_usart *usart)
        while ((c = _ao_usart_pollchar(usart)) == AO_READ_AGAIN)
                ao_sleep(&usart->rx_fifo);
        ao_arch_release_interrupts();
+       ao_usb_putchar(c); ao_usb_flush();
        return (char) c;
 }
 
 static inline uint8_t
-_ao_usart_sleep(struct ao_stm_usart *usart)
+_ao_usart_sleep_for(struct ao_stm_usart *usart, uint16_t timeout)
 {
-       return ao_sleep(&usart->rx_fifo);
+       return ao_sleep_for(&usart->rx_fifo, timeout);
 }
 
 void
 ao_usart_putchar(struct ao_stm_usart *usart, char c)
 {
+       ao_usb_putchar(c); ao_usb_flush();
        ao_arch_block_interrupts();
        while (ao_fifo_full(usart->tx_fifo))
                ao_sleep(&usart->tx_fifo);
@@ -102,12 +118,14 @@ ao_usart_putchar(struct ao_stm_usart *usart, char c)
        ao_arch_release_interrupts();
 }
 
-void
+static void
 ao_usart_drain(struct ao_stm_usart *usart)
 {
        ao_arch_block_interrupts();
-       while (!ao_fifo_empty(usart->tx_fifo))
+       while (!ao_fifo_empty(usart->tx_fifo) || usart->tx_running) {
+               usart->draining = 1;
                ao_sleep(&usart->tx_fifo);
+       }
        ao_arch_release_interrupts();
 }
 
@@ -150,7 +168,7 @@ ao_usart_init(struct ao_stm_usart *usart)
                          (0 << STM_USART_CR1_PS) |
                          (0 << STM_USART_CR1_PEIE) |
                          (0 << STM_USART_CR1_TXEIE) |
-                         (1 << STM_USART_CR1_TCIE) |
+                         (0 << STM_USART_CR1_TCIE) |
                          (1 << STM_USART_CR1_RXNEIE) |
                          (0 << STM_USART_CR1_IDLEIE) |
                          (1 << STM_USART_CR1_TE) |
@@ -217,9 +235,9 @@ _ao_serial1_pollchar(void)
 }
 
 uint8_t
-_ao_serial1_sleep(void)
+_ao_serial1_sleep_for(uint16_t timeout)
 {
-       return _ao_usart_sleep(&ao_stm_usart1);
+       return _ao_usart_sleep_for(&ao_stm_usart1, timeout);
 }
 
 void
@@ -231,6 +249,7 @@ ao_serial1_drain(void)
 void
 ao_serial1_set_speed(uint8_t speed)
 {
+       ao_usart_drain(&ao_stm_usart1);
        ao_usart_set_speed(&ao_stm_usart1, speed);
 }
 #endif /* HAS_SERIAL_1 */
@@ -260,9 +279,9 @@ _ao_serial2_pollchar(void)
 }
 
 uint8_t
-_ao_serial2_sleep(void)
+_ao_serial2_sleep_for(uint16_t timeout)
 {
-       return _ao_usart_sleep(&ao_stm_usart2);
+       return _ao_usart_sleep_for(&ao_stm_usart2, timeout);
 }
 
 void
@@ -274,6 +293,7 @@ ao_serial2_drain(void)
 void
 ao_serial2_set_speed(uint8_t speed)
 {
+       ao_usart_drain(&ao_stm_usart2);
        ao_usart_set_speed(&ao_stm_usart2, speed);
 }
 #endif /* HAS_SERIAL_2 */
@@ -303,16 +323,23 @@ _ao_serial3_pollchar(void)
 }
 
 uint8_t
-_ao_serial3_sleep(void)
+_ao_serial3_sleep_for(uint16_t timeout)
 {
-       return _ao_usart_sleep(&ao_stm_usart3);
+       return _ao_usart_sleep_for(&ao_stm_usart3, timeout);
 }
 
 void
 ao_serial3_set_speed(uint8_t speed)
 {
+       ao_usart_drain(&ao_stm_usart3);
        ao_usart_set_speed(&ao_stm_usart3, speed);
 }
+
+void
+ao_serial3_drain(void)
+{
+       ao_usart_drain(&ao_stm_usart3);
+}
 #endif /* HAS_SERIAL_3 */
 
 void