Switch from GPLv2 to GPLv2+

[fw/altos] / src / cc1111 / ao_serial.c

diff --git a/src/cc1111/ao_serial.c b/src/cc1111/ao_serial.c
index 4838380228214dcf7fe0e475bf493a89237bcc21..70293b4e4247bed35abb806d1ac1da6512fd8ddb 100644 (file)
--- a/src/cc1111/ao_serial.c
+++ b/src/cc1111/ao_serial.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,8 +35,26 @@ const __code struct ao_serial_speed ao_serial_speeds[] = {
                /* .baud = */ 59,
                /* .gcr =  */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
        },
+       /* [AO_SERIAL_SPEED_115200] = */ {
+               /* .baud = */ 59,
+               /* .gcr =  */ (12 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+       },
 };
 
+#define AO_SERIAL_SPEED_MAX    AO_SERIAL_SPEED_115200
+
+#if HAS_SERIAL_1_ALT_1
+#define SERIAL_1_RTS P0_3
+#else
+#define SERIAL_1_RTS P1_5
+#endif
+
+#if HAS_SERIAL_0_ALT_1
+#define SERIAL_0_RTS P0_5
+#else
+#define SERIAL_0_RTS P1_3
+#endif
+
 #if HAS_SERIAL_0
 
 volatile __xdata struct ao_fifo        ao_serial0_rx_fifo;
@@ -50,6 +69,10 @@ ao_serial0_rx_isr(void) __interrupt 2
 #if USE_SERIAL_0_STDIN
        ao_wakeup(&ao_stdin_ready);
 #endif
+#if HAS_SERIAL_0_HW_FLOW
+       if (ao_fifo_mostly(ao_serial0_rx_fifo))
+               SERIAL_0_RTS = 1;
+#endif
 }
 
 static __xdata uint8_t ao_serial0_tx_started;
@@ -81,17 +104,25 @@ ao_serial0_getchar(void) __critical
        while (ao_fifo_empty(ao_serial0_rx_fifo))
                ao_sleep(&ao_serial0_rx_fifo);
        ao_fifo_remove(ao_serial0_rx_fifo, c);
+#if HAS_SERIAL_0_HW_FLOW
+       if (ao_fifo_barely(ao_serial0_rx_fifo))
+               SERIAL_0_RTS = 0;
+#endif
        return c;
 }
 
 #if USE_SERIAL_0_STDIN
-char
-ao_serial0_pollchar(void) __critical
+int
+_ao_serial0_pollchar(void)
 {
-       char    c;
+       uint8_t c;
        if (ao_fifo_empty(ao_serial0_rx_fifo))
                return AO_READ_AGAIN;
        ao_fifo_remove(ao_serial0_rx_fifo,c);
+#if HAS_SERIAL_0_HW_FLOW
+       if (ao_fifo_barely(ao_serial0_rx_fifo))
+               SERIAL_0_RTS = 0;
+#endif
        return c;
 }
 #endif
@@ -116,7 +147,7 @@ void
 ao_serial0_set_speed(uint8_t speed)
 {
        ao_serial0_drain();
-       if (speed > AO_SERIAL_SPEED_57600)
+       if (speed > AO_SERIAL_SPEED_MAX)
                return;
        U0UCR |= UxUCR_FLUSH;
        U0BAUD = ao_serial_speeds[speed].baud;
@@ -138,6 +169,10 @@ ao_serial1_rx_isr(void) __interrupt 3
 #if USE_SERIAL_1_STDIN
        ao_wakeup(&ao_stdin_ready);
 #endif
+#if HAS_SERIAL_1_HW_FLOW
+       if (ao_fifo_mostly(ao_serial1_rx_fifo))
+               SERIAL_1_RTS = 1;
+#endif
 }
 
 static __xdata uint8_t ao_serial1_tx_started;
@@ -169,17 +204,25 @@ ao_serial1_getchar(void) __critical
        while (ao_fifo_empty(ao_serial1_rx_fifo))
                ao_sleep(&ao_serial1_rx_fifo);
        ao_fifo_remove(ao_serial1_rx_fifo, c);
+#if HAS_SERIAL_1_HW_FLOW
+       if (ao_fifo_barely(ao_serial1_rx_fifo))
+               SERIAL_1_RTS = 0;
+#endif
        return c;
 }
 
 #if USE_SERIAL_1_STDIN
-char
-ao_serial1_pollchar(void) __critical
+int
+_ao_serial1_pollchar(void)
 {
-       char    c;
+       uint8_t c;
        if (ao_fifo_empty(ao_serial1_rx_fifo))
                return AO_READ_AGAIN;
        ao_fifo_remove(ao_serial1_rx_fifo,c);
+#if HAS_SERIAL_1_HW_FLOW
+       if (ao_fifo_barely(ao_serial1_rx_fifo))
+               SERIAL_1_RTS = 0;
+#endif
        return c;
 }
 #endif
@@ -204,7 +247,7 @@ void
 ao_serial1_set_speed(uint8_t speed)
 {
        ao_serial1_drain();
-       if (speed > AO_SERIAL_SPEED_57600)
+       if (speed > AO_SERIAL_SPEED_MAX)
                return;
        U1UCR |= UxUCR_FLUSH;
        U1BAUD = ao_serial_speeds[speed].baud;
@@ -226,7 +269,11 @@ ao_serial_init(void)
        /* Make the USART pins be controlled by the USART */
        P0SEL |= (1 << 2) | (1 << 3);
 #if HAS_SERIAL_0_HW_FLOW
-       P0SEL |= (1 << 4) | (1 << 5);
+       SERIAL_0_RTS = 0;
+       P0DIR |= (1 << 5);
+
+       P0SEL |= (1 << 4);
+       P0INP |= (1 << 4);
 #endif
 #else
        /* Set up the USART pin assignment */
@@ -238,7 +285,11 @@ ao_serial_init(void)
        /* Make the USART pins be controlled by the USART */
        P1SEL |= (1 << 5) | (1 << 4);
 #if HAS_SERIAL_0_HW_FLOW
-       P1SEL |= (1 << 3) | (1 << 2);
+       SERIAL_0_RTS = 0;
+       P1DIR |= (1 << 3);
+
+       P1SEL |= (1 << 2);
+       P1INP |= (1 << 2);
 #endif
 #endif
 
@@ -265,7 +316,7 @@ ao_serial_init(void)
        IEN0 |= IEN0_URX0IE;
        IEN2 |= IEN2_UTX0IE;
 #if USE_SERIAL_0_STDIN && !DELAY_SERIAL_0_STDIN
-       ao_add_stdio(ao_serial0_pollchar,
+       ao_add_stdio(_ao_serial0_pollchar,
                     ao_serial0_putchar,
                     NULL);
 #endif
@@ -281,7 +332,13 @@ ao_serial_init(void)
        /* 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);
+       /* SW RTS control (hw doesn't work) */
+       SERIAL_1_RTS = 0;
+       P0DIR |= 1 << 3;
+
+       /* HW CTS. Maybe this works? */
+       P0SEL |= 1 << 2;
+       P0INP |= 1 << 2;
 #endif
 #else
        /* Set up the USART pin assignment */
@@ -293,7 +350,13 @@ ao_serial_init(void)
        /* Make the USART pins be controlled by the USART */
        P1SEL |= (1 << 6) | (1 << 7);
 #if HAS_SERIAL_1_HW_FLOW
-       P1SEL |= (1 << 5) | (1 << 4);
+       /* SW RTS control (hw doesn't work) */
+       SERIAL_1_RTS = 0;
+       P1DIR |= (1 << 5);
+
+       /* HW CTS. Maybe this works? */
+       P1SEL |= (1 << 4);
+       P1INP |= (1 << 4);
 #endif
 #endif
 
@@ -321,7 +384,7 @@ ao_serial_init(void)
        IEN2 |= IEN2_UTX1IE;
 
 #if USE_SERIAL_1_STDIN && !DELAY_SERIAL_1_STDIN
-       ao_add_stdio(ao_serial1_pollchar,
+       ao_add_stdio(_ao_serial1_pollchar,
                     ao_serial1_putchar,
                     NULL);
 #endif