altos: Add support for UART0 in async mode

And copy bytes from it to stdout.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index e6c27a1e23d60371bd5afe72dde68d1bd6752420..360b35c8b239517109a8773b493827fa42b37e53 100644 (file)
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -251,4 +251,11 @@ _ao_xmemcmp(__xdata void *a, __xdata void *b, uint8_t count);
 
 #define ao_xmemcmp(d,s,c) _ao_xmemcmp((d), (s), (c))
 
 
 #define ao_xmemcmp(d,s,c) _ao_xmemcmp((d), (s), (c))
 

+struct ao_serial_speed {
+       uint8_t baud;
+       uint8_t gcr;
+};
+
+extern const __code struct ao_serial_speed ao_serial_speeds[];
+

 #endif /* _AO_ARCH_H_ */
 #endif /* _AO_ARCH_H_ */

diff --git a/src/cc1111/ao_serial.c b/src/cc1111/ao_serial.c
index 82370c6426acaa8a349224c56aae3d1cfb82e7cd..4d5b9abd5693c048e61c737944965c42d50bb17b 100644 (file)
--- a/src/cc1111/ao_serial.c
+++ b/src/cc1111/ao_serial.c
@@ -91,10 +91,7 @@ ao_serial_drain(void) __critical
                ao_sleep(&ao_usart1_tx_fifo);
 }
 
                ao_sleep(&ao_usart1_tx_fifo);
 }
 

-static __code struct {
-       uint8_t baud;
-       uint8_t gcr;
-} ao_serial_speeds[] = {
+const __code struct ao_serial_speed ao_serial_speeds[] = {

        /* [AO_SERIAL_SPEED_4800] = */ {
                /* .baud = */ 163,
                /* .gcr  = */ (7 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
        /* [AO_SERIAL_SPEED_4800] = */ {
                /* .baud = */ 163,
                /* .gcr  = */ (7 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB

diff --git a/src/cc1111/ao_serial0.c b/src/cc1111/ao_serial0.c
new file mode 100644 (file)
index 0000000..140721b
--- /dev/null
+++ b/src/cc1111/ao_serial0.c
@@ -0,0 +1,152 @@
+/*
+ * Copyright © 2009 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ao.h"
+
+volatile __xdata struct ao_fifo        ao_usart0_rx_fifo;
+volatile __xdata struct ao_fifo        ao_usart0_tx_fifo;
+
+void
+ao_serial0_rx0_isr(void) __interrupt 2
+{
+       if (!ao_fifo_full(ao_usart0_rx_fifo))
+               ao_fifo_insert(ao_usart0_rx_fifo, U0DBUF);
+       ao_wakeup(&ao_usart0_rx_fifo);
+}
+
+static __xdata uint8_t ao_serial0_tx0_started;
+
+static void
+ao_serial0_tx0_start(void)
+{
+       if (!ao_fifo_empty(ao_usart0_tx_fifo) &&
+           !ao_serial0_tx0_started)
+       {
+               ao_serial0_tx0_started = 1;
+               ao_fifo_remove(ao_usart0_tx_fifo, U0DBUF);
+       }
+}
+
+void
+ao_serial0_tx0_isr(void) __interrupt 7
+{
+       UTX0IF = 0;
+       ao_serial0_tx0_started = 0;
+       ao_serial0_tx0_start();
+       ao_wakeup(&ao_usart0_tx_fifo);
+}
+
+char
+ao_serial0_getchar(void) __critical
+{
+       char    c;
+       while (ao_fifo_empty(ao_usart0_rx_fifo))
+               ao_sleep(&ao_usart0_rx_fifo);
+       ao_fifo_remove(ao_usart0_rx_fifo, c);
+       return c;
+}
+
+#if USE_SERIAL_STDIN
+char
+ao_serial0_pollchar(void) __critical
+{
+       char    c;
+       if (ao_fifo_empty(ao_usart0_rx_fifo))
+               return AO_READ_AGAIN;
+       ao_fifo_remove(ao_usart0_rx_fifo,c);
+       return c;
+}
+#endif
+
+void
+ao_serial0_putchar(char c) __critical
+{
+       while (ao_fifo_full(ao_usart0_tx_fifo))
+               ao_sleep(&ao_usart0_tx_fifo);
+       ao_fifo_insert(ao_usart0_tx_fifo, c);
+       ao_serial0_tx0_start();
+}
+
+void
+ao_serial0_drain(void) __critical
+{
+       while (!ao_fifo_empty(ao_usart0_tx_fifo))
+               ao_sleep(&ao_usart0_tx_fifo);
+}
+
+void
+ao_serial0_set_speed(uint8_t speed)
+{
+       ao_serial0_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_serial0_init(void)
+{
+#if HAS_SERIAL_0_ALT_1
+       /* Set up the USART pin assignment */
+       PERCFG = (PERCFG & ~PERCFG_U0CFG_ALT_MASK) | PERCFG_U0CFG_ALT_1;
+
+       P2DIR = (P2DIR & ~P2DIR_PRIP0_MASK) | P2DIR_PRIP0_USART0_USART1;
+
+       /* 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);
+#endif
+#else
+       /* Set up the USART pin assignment */
+       PERCFG = (PERCFG & ~PERCFG_U0CFG_ALT_MASK) | PERCFG_U0CFG_ALT_2;
+
+       P2SEL = (P2SEL & ~(P2SEL_PRI3P1_MASK | P2SEL_PRI0P1_MASK)) |
+               (P2SEL_PRI3P1_USART0 | P2SEL_PRI0P1_USART0);
+
+       /* Make the USART pins be controlled by the USART */
+       P1SEL |= (1 << 2) | (1 << 3);
+#if HAS_SERIAL_0_HW_FLOW
+       P1SEL |= (1 << 5) | (1 << 4);
+#endif
+#endif
+
+       /* UART mode with receiver enabled */
+       U0CSR = (UxCSR_MODE_UART | UxCSR_RE);
+
+       /* Pick a 9600 baud rate */
+       ao_serial0_set_speed(AO_SERIAL_SPEED_9600);
+
+       /* Reasonable serial parameters */
+       U0UCR = (UxUCR_FLUSH |
+#if HAS_SERIAL_0_HW_FLOW
+                UxUCR_FLOW_ENABLE |
+#else
+                UxUCR_FLOW_DISABLE |
+#endif
+                UxUCR_D9_EVEN_PARITY |
+                UxUCR_BIT9_8_BITS |
+                UxUCR_PARITY_DISABLE |
+                UxUCR_SPB_1_STOP_BIT |
+                UxUCR_STOP_HIGH |
+                UxUCR_START_LOW);
+
+       IEN0 |= IEN0_URX0IE;
+       IEN2 |= IEN2_UTX0IE;
+}

diff --git a/src/core/ao.h b/src/core/ao.h
index 1fbcf7df554018b90f7376959d3f4782eec5c8b7..494993f12992b8f7b5e71bd190da155bc3068dc6 100644 (file)
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -938,6 +938,35 @@ void
 ao_serial_init(void);
 #endif
 
 ao_serial_init(void);
 #endif
 

+#ifndef HAS_SERIAL_0
+#define HAS_SERIAL_0 0
+#endif
+
+#if HAS_SERIAL_0
+void
+ao_serial0_rx0_isr(void) ao_arch_interrupt(2);
+
+void
+ao_serial0_tx0_isr(void) ao_arch_interrupt(7);
+
+char
+ao_serial0_getchar(void) __critical;
+
+void
+ao_serial0_putchar(char c) __critical;
+
+void
+ao_serial0_drain(void) __critical;
+
+void
+ao_serial0_set_speed(uint8_t speed);
+
+void
+ao_serial0_init(void);
+
+#endif
+
+

 /*
  * ao_spi.c
  */
 /*
  * ao_spi.c
  */

diff --git a/src/teleshield-v0.1/Makefile b/src/teleshield-v0.1/Makefile
index b63a81d6aa40ca824f0be20f97981d7a624757e0..a21a6052423e642da89eee6c7bd87b1fa6bc9804 100644 (file)
--- a/src/teleshield-v0.1/Makefile
+++ b/src/teleshield-v0.1/Makefile
@@ -53,6 +53,7 @@ CC1111_SRC = \
        ao_radio.c \
        ao_romconfig.c \
        ao_serial.c \
        ao_radio.c \
        ao_romconfig.c \
        ao_serial.c \

+       ao_serial0.c \

        ao_string.c \
        ao_timer.c \
        ao_usb.c \
        ao_string.c \
        ao_timer.c \
        ao_usb.c \


@@ -62,7 +63,8 @@ DRIVER_SRC = \
        $(TELESHIELD_SRC)
 
 PRODUCT_SRC = \
        $(TELESHIELD_SRC)
 
 PRODUCT_SRC = \

-       ao_teleshield.c
+       ao_teleshield.c \
+       ao_ardu_serial.c

 
 SRC = \
        $(CORE_SRC) \
 
 SRC = \
        $(CORE_SRC) \

diff --git a/src/teleshield-v0.1/ao_ardu_serial.c b/src/teleshield-v0.1/ao_ardu_serial.c
new file mode 100644 (file)
index 0000000..7d4dc0d
--- /dev/null
+++ b/src/teleshield-v0.1/ao_ardu_serial.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ao.h"
+
+static void
+ao_ardu_serial_recv(void)
+{
+       char    c;
+
+       for (;;) {
+               c = ao_serial0_getchar();
+               putchar (c);
+       }
+}
+
+static __xdata struct ao_task ao_ardu_serial_recv_task;
+
+void
+ao_ardu_serial_init (void)
+{
+       ao_serial0_init();
+       ao_add_task(&ao_ardu_serial_recv_task, ao_ardu_serial_recv, "recv");
+}

diff --git a/src/teleshield-v0.1/ao_pins.h b/src/teleshield-v0.1/ao_pins.h
index 1f65973953fa0e07d267fc84fb1fd9ade6b8f754..a907e2a512d0dcba668ca086478ba06e0c25f851 100644 (file)
--- a/src/teleshield-v0.1/ao_pins.h
+++ b/src/teleshield-v0.1/ao_pins.h
@@ -27,6 +27,10 @@
        #define HAS_SERIAL_1_ALT_2      0
        #define HAS_SERIAL_1_HW_FLOW    1
        #define USE_SERIAL_STDIN        1
        #define HAS_SERIAL_1_ALT_2      0
        #define HAS_SERIAL_1_HW_FLOW    1
        #define USE_SERIAL_STDIN        1

+       #define HAS_SERIAL_0            1
+       #define HAS_SERIAL_0_ALT_1      0
+       #define HAS_SERIAL_0_ALT_2      1
+       #define HAS_SERIAL_0_HW_FLOW    0

        #define HAS_ADC                 0
        #define HAS_DBG                 1
        #define HAS_EEPROM              0
        #define HAS_ADC                 0
        #define HAS_DBG                 1
        #define HAS_EEPROM              0


@@ -214,4 +218,8 @@
 #define AO_IGNITER_FIRE_TIME   AO_MS_TO_TICKS(50)
 #define AO_IGNITER_CHARGE_TIME AO_MS_TO_TICKS(2000)
 
 #define AO_IGNITER_FIRE_TIME   AO_MS_TO_TICKS(50)
 #define AO_IGNITER_CHARGE_TIME AO_MS_TO_TICKS(2000)
 

+void
+ao_ardu_serial_init (void);
+
+

 #endif /* _AO_PINS_H_ */
 #endif /* _AO_PINS_H_ */

diff --git a/src/teleshield-v0.1/ao_teleshield.c b/src/teleshield-v0.1/ao_teleshield.c
index 3e07a95512b2859755dfd7275b4e2c385311a4d0..fd12ce7a7580e19060427143b4e32fd3ce6b7993 100644 (file)
--- a/src/teleshield-v0.1/ao_teleshield.c
+++ b/src/teleshield-v0.1/ao_teleshield.c
@@ -43,6 +43,7 @@ main(void)
        ao_aes_init();
        ao_radio_cmac_init();
 #endif
        ao_aes_init();
        ao_radio_cmac_init();
 #endif

+       ao_ardu_serial_init();

        ao_config_init();
        ao_start_scheduler();
 }
        ao_config_init();
        ao_start_scheduler();
 }