altos: Massive product config cleanup

Support multiple serial ports more cleanly

Split out parts of ao.h into separate feature header files

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

1 files changed, 0 insertions, 152 deletions

diff --git a/src/cc1111/ao_serial0.c b/src/cc1111/ao_serial0.c
deleted file mode 100644
index e8c1eb35..00000000
--- a/src/cc1111/ao_serial0.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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;
-	U0UCR |= UxUCR_FLUSH;
-	U0BAUD = ao_serial_speeds[speed].baud;
-	U0GCR = 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;
-}