altos: Clean up serial initialization

[fw/altos] / src / ao_serial.c

diff --git a/src/ao_serial.c b/src/ao_serial.c
index ce11694002162ea5b70ab650c25f2c6dc14cae5f..9c0b798daf674cfcd894fe07db4eefa4c7cab236 100644 (file)
--- a/src/ao_serial.c
+++ b/src/ao_serial.c
@@ -21,11 +21,14 @@ volatile __xdata struct ao_fifo     ao_usart1_rx_fifo;
 volatile __xdata struct ao_fifo        ao_usart1_tx_fifo;
 
 void
-ao_serial_rx1_isr(void) interrupt 3
+ao_serial_rx1_isr(void) __interrupt 3
 {
        if (!ao_fifo_full(ao_usart1_rx_fifo))
                ao_fifo_insert(ao_usart1_rx_fifo, U1DBUF);
        ao_wakeup(&ao_usart1_rx_fifo);
+#if USE_SERIAL_STDIN
+       ao_wakeup(&ao_stdin_ready);
+#endif
 }
 
 static __xdata uint8_t ao_serial_tx1_started;
@@ -42,7 +45,7 @@ ao_serial_tx1_start(void)
 }
 
 void
-ao_serial_tx1_isr(void) interrupt 14
+ao_serial_tx1_isr(void) __interrupt 14
 {
        UTX1IF = 0;
        ao_serial_tx1_started = 0;
@@ -60,6 +63,18 @@ ao_serial_getchar(void) __critical
        return c;
 }
 
+#if USE_SERIAL_STDIN
+char
+ao_serial_pollchar(void) __critical
+{
+       char    c;
+       if (ao_fifo_empty(ao_usart1_rx_fifo))
+               return AO_READ_AGAIN;
+       ao_fifo_remove(ao_usart1_rx_fifo,c);
+       return c;
+}
+#endif
+
 void
 ao_serial_putchar(char c) __critical
 {
@@ -69,28 +84,54 @@ ao_serial_putchar(char c) __critical
        ao_serial_tx1_start();
 }
 
-static void
-send_serial(void)
+void
+ao_serial_drain(void) __critical
 {
-       ao_cmd_white();
-       while (ao_cmd_lex_c != '\n') {
-               ao_serial_putchar(ao_cmd_lex_c);
-               ao_cmd_lex();
-       }
+       while (!ao_fifo_empty(ao_usart1_tx_fifo))
+               ao_sleep(&ao_usart1_tx_fifo);
 }
 
-__code struct ao_cmds ao_serial_cmds[] = {
-       { 'S', send_serial,             "S <data>                           Send data to serial line" },
-       { 0, send_serial, NULL },
+static const struct {
+       uint8_t baud;
+       uint8_t gcr;
+} ao_serial_speeds[] = {
+       /* [AO_SERIAL_SPEED_4800] = */ {
+               /* .baud = */ 163,
+               /* .gcr  = */ (7 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+       },
+       /* [AO_SERIAL_SPEED_9600] = */ {
+               /* .baud = */ 163,
+               /* .gcr  = */ (8 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+       },
+       /* [AO_SERIAL_SPEED_19200] = */ {
+               /* .baud = */ 163,
+               /* .gcr  = */ (9 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+       },
+       /* [AO_SERIAL_SPEED_57600] = */ {
+               /* .baud = */ 59,
+               /* .gcr =  */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+       },
 };
 
+void
+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;
+}
+
 void
 ao_serial_init(void)
 {
        /* 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);
@@ -99,13 +140,12 @@ ao_serial_init(void)
        U1CSR = (UxCSR_MODE_UART | UxCSR_RE);
 
        /* Pick a 4800 baud rate */
-       U1BAUD = 163;                           /* 4800 */
-       U1GCR = 7 << UxGCR_BAUD_E_SHIFT;        /* 4800 */
+       ao_serial_set_speed(AO_SERIAL_SPEED_4800);
 
        /* Reasonable serial parameters */
        U1UCR = (UxUCR_FLUSH |
                 UxUCR_FLOW_DISABLE |
-                UxUCR_D9_ODD_PARITY |
+                UxUCR_D9_EVEN_PARITY |
                 UxUCR_BIT9_8_BITS |
                 UxUCR_PARITY_DISABLE |
                 UxUCR_SPB_1_STOP_BIT |
@@ -114,6 +154,4 @@ ao_serial_init(void)
 
        IEN0 |= IEN0_URX1IE;
        IEN2 |= IEN2_UTX1IE;
-
-       ao_cmd_register(&ao_serial_cmds[0]);
 }