altos: Require sequencing through 'main' state before landing

[fw/altos] / src / ao_serial.c

diff --git a/src/ao_serial.c b/src/ao_serial.c
index e9373e232cb700fd735a3a72968b04d1c787c078..82370c6426acaa8a349224c56aae3d1cfb82e7cd 100644 (file)
--- a/src/ao_serial.c
+++ b/src/ao_serial.c
@@ -20,10 +20,6 @@
 volatile __xdata struct ao_fifo        ao_usart1_rx_fifo;
 volatile __xdata struct ao_fifo        ao_usart1_tx_fifo;
 
-#if USE_SERIAL_STDIN
-__pdata uint8_t        ao_serial_stdin;
-#endif
-
 void
 ao_serial_rx1_isr(void) __interrupt 3
 {
@@ -31,8 +27,7 @@ ao_serial_rx1_isr(void) __interrupt 3
                ao_fifo_insert(ao_usart1_rx_fifo, U1DBUF);
        ao_wakeup(&ao_usart1_rx_fifo);
 #if USE_SERIAL_STDIN
-       if (ao_serial_stdin)
-               ao_wakeup(&ao_stdin_ready);
+       ao_wakeup(&ao_stdin_ready);
 #endif
 }
 
@@ -73,22 +68,11 @@ char
 ao_serial_pollchar(void) __critical
 {
        char    c;
-#if 0
-       if (!ao_serial_stdin)
-               return AO_READ_AGAIN;
-#endif
        if (ao_fifo_empty(ao_usart1_rx_fifo))
                return AO_READ_AGAIN;
        ao_fifo_remove(ao_usart1_rx_fifo,c);
        return c;
 }
-
-void
-ao_serial_set_stdin(uint8_t stdin)
-{
-       ao_serial_stdin = stdin;
-}
-
 #endif
 
 void
@@ -107,7 +91,7 @@ ao_serial_drain(void) __critical
                ao_sleep(&ao_usart1_tx_fifo);
 }
 
-static const struct {
+static __code struct {
        uint8_t baud;
        uint8_t gcr;
 } ao_serial_speeds[] = {
@@ -135,6 +119,7 @@ ao_serial_set_speed(uint8_t speed)
        ao_serial_drain();
        if (speed > AO_SERIAL_SPEED_57600)
                return;
+       U1UCR |= UxUCR_FLUSH;
        U1BAUD = ao_serial_speeds[speed].baud;
        U1GCR = ao_serial_speeds[speed].gcr;
 }
@@ -142,13 +127,28 @@ ao_serial_set_speed(uint8_t speed)
 void
 ao_serial_init(void)
 {
+#if HAS_SERIAL_1_ALT_1
+       /* Set up the USART pin assignment */
+       PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_1;
+
+       P2DIR = (P2DIR & ~P2DIR_PRIP0_MASK) | P2DIR_PRIP0_USART1_USART0;
+
+       /* Make the USART pins be controlled by the USART */
+       P0SEL |= (1 << 5) | (1 << 4);
+#if HAS_SERIAL_1_HW_FLOW
+       P0SEL |= (1 << 3) | (1 << 2);
+#endif
+#else
        /* Set up the USART pin assignment */
        PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_2;
 
-       /* ee has already set the P2SEL bits */
+       P2SEL = (P2SEL & ~(P2SEL_PRI3P1_MASK | P2SEL_PRI2P1_MASK)) |
+               (P2SEL_PRI3P1_USART1 | P2SEL_PRI2P1_USART1);
 
        /* Make the USART pins be controlled by the USART */
        P1SEL |= (1 << 6) | (1 << 7);
+       P1SEL |= (1 << 5) | (1 << 4);
+#endif
 
        /* UART mode with receiver enabled */
        U1CSR = (UxCSR_MODE_UART | UxCSR_RE);
@@ -158,8 +158,12 @@ ao_serial_init(void)
 
        /* Reasonable serial parameters */
        U1UCR = (UxUCR_FLUSH |
+#if HAS_SERIAL_1_HW_FLOW
+                UxUCR_FLOW_ENABLE |
+#else
                 UxUCR_FLOW_DISABLE |
-                UxUCR_D9_ODD_PARITY |
+#endif
+                UxUCR_D9_EVEN_PARITY |
                 UxUCR_BIT9_8_BITS |
                 UxUCR_PARITY_DISABLE |
                 UxUCR_SPB_1_STOP_BIT |
@@ -168,11 +172,4 @@ ao_serial_init(void)
 
        IEN0 |= IEN0_URX1IE;
        IEN2 |= IEN2_UTX1IE;
-#if 0
-#if USE_SERIAL_STDIN
-       ao_add_stdio(ao_serial_pollchar,
-                    ao_serial_putchar,
-                    NULL);
-#endif
-#endif
 }