altos: Use explicit boot loader signal in ao_boot_reboot

[fw/altos] / src / lpc / ao_serial_lpc.c

diff --git a/src/lpc/ao_serial_lpc.c b/src/lpc/ao_serial_lpc.c
index c04246990cf41652bf3788a6e3ec0352d0df15d5..b0d5fcbc577003cc8076a73684f4f86d6abe2624 100644 (file)
--- a/src/lpc/ao_serial_lpc.c
+++ b/src/lpc/ao_serial_lpc.c
@@ -49,25 +49,29 @@ _ao_serial_tx_start(void)
 void
 lpc_usart_isr(void)
 {
+       uint8_t wake_input = 0;
        (void) lpc_usart.iir_fcr;
 
        while (lpc_usart.lsr & (1 << LPC_USART_LSR_RDR)) {
                char c = lpc_usart.rbr_thr;
                if (!ao_fifo_full(ao_usart_rx_fifo))
                        ao_fifo_insert(ao_usart_rx_fifo, c);
-               ao_wakeup(&ao_usart_rx_fifo);
-               if (stdin)
-                       ao_wakeup(&ao_stdin_ready);
+               wake_input = 1;
        }
        if (lpc_usart.lsr & (1 << LPC_USART_LSR_THRE)) {
                ao_usart_tx_avail = LPC_USART_TX_FIFO_SIZE;
                _ao_serial_tx_start();
                ao_wakeup(&ao_usart_tx_fifo);
        }
+       if (wake_input) {
+               ao_wakeup(&ao_usart_rx_fifo);
+               if (stdin)
+                       ao_wakeup(&ao_stdin_ready);
+       }
 }
 
 int
-_ao_serial_pollchar(void)
+_ao_serial0_pollchar(void)
 {
        int     c;
        
@@ -82,18 +86,18 @@ _ao_serial_pollchar(void)
 }
 
 char
-ao_serial_getchar(void)
+ao_serial0_getchar(void)
 {
        int c;
        ao_arch_block_interrupts();
-       while ((c = _ao_serial_pollchar()) == AO_READ_AGAIN)
+       while ((c = _ao_serial0_pollchar()) == AO_READ_AGAIN)
                ao_sleep(&ao_usart_rx_fifo);
        ao_arch_release_interrupts();
        return (char) c;
 }
 
 void
-ao_serial_putchar(char c)
+ao_serial0_putchar(char c)
 {
        ao_arch_block_interrupts();
        while (ao_fifo_full(ao_usart_tx_fifo))
@@ -104,7 +108,7 @@ ao_serial_putchar(char c)
 }
 
 void
-ao_serial_drain(void)
+ao_serial0_drain(void)
 {
        ao_arch_block_interrupts();
        while (!ao_fifo_empty(ao_usart_tx_fifo))
@@ -115,7 +119,7 @@ ao_serial_drain(void)
 #include "ao_serial_lpc.h"
 
 void
-ao_serial_set_speed(uint8_t speed)
+ao_serial0_set_speed(uint8_t speed)
 {
        if (speed > AO_SERIAL_SPEED_115200)
                return;
@@ -193,7 +197,7 @@ ao_serial_init(void)
        lpc_usart.hden = ((0 << LPC_USART_HDEN_HDEN));
 
        /* Set baud rate */
-       ao_serial_set_speed(AO_SERIAL_SPEED_9600);
+       ao_serial0_set_speed(AO_SERIAL_SPEED_9600);
 
        /* Enable interrupts */
        lpc_usart.ier = ((1 << LPC_USART_IER_RBRINTEN) |
@@ -202,8 +206,8 @@ ao_serial_init(void)
        lpc_nvic_set_enable(LPC_ISR_USART_POS);
        lpc_nvic_set_priority(LPC_ISR_USART_POS, 0);
 #if USE_SERIAL_0_STDIN
-       ao_add_stdio(_ao_serial_pollchar,
-                    ao_serial_putchar,
+       ao_add_stdio(_ao_serial0_pollchar,
+                    ao_serial0_putchar,
                     NULL);
 #endif
 }