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 d6b0082a093c400498b1013230efcc03854db3d4..b0d5fcbc577003cc8076a73684f4f86d6abe2624 100644 (file)
--- a/src/lpc/ao_serial_lpc.c
+++ b/src/lpc/ao_serial_lpc.c
@@ -49,21 +49,25 @@ _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
@@ -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
 }