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>

6 files changed, 228 insertions, 311 deletions

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 847ac1a6..9d0643b4 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -294,4 +294,34 @@ ao_dma_abort(uint8_t id);
 void
 ao_dma_isr(void) ao_arch_interrupt(8);
 
+/* ao_adc.c */
+
+#if HAS_ADC
+/* The A/D interrupt handler */
+void
+ao_adc_isr(void) ao_arch_interrupt(1);
+#endif
+
+#if HAS_USB
+/* USB interrupt handler */
+void
+ao_usb_isr(void) ao_arch_interrupt(6);
+#endif
+
+#if HAS_SERIAL_0
+void
+ao_serial0_rx_isr(void) ao_arch_interrupt(2);
+
+void
+ao_serial0_tx_isr(void) ao_arch_interrupt(7);
+#endif
+
+#if HAS_SERIAL_1
+void
+ao_serial1_rx_isr(void) ao_arch_interrupt(3);
+
+void
+ao_serial1_tx_isr(void) ao_arch_interrupt(14);
+#endif
+
 #endif /* _AO_ARCH_H_ */
diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
index 5c0cb7df..4f6edd37 100644
--- a/src/cc1111/ao_pins.h
+++ b/src/cc1111/ao_pins.h
@@ -25,7 +25,6 @@
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			1
-	#define USE_SERIAL_STDIN	0
 	#define HAS_EEPROM		1
 	#define HAS_LOG			1
 	#define USE_INTERNAL_FLASH	0
@@ -58,7 +57,6 @@
 	#define HAS_BEEP		1
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
 	#define HAS_LOG			1
@@ -95,7 +93,6 @@
 	#define HAS_BEEP		1
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
 	#define HAS_LOG			1
@@ -131,7 +128,6 @@
 	#define HAS_USB			1
 	#define HAS_BEEP		0
 	#define HAS_SERIAL_1		0
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			0
 	#define HAS_DBG			1
 	#define HAS_EEPROM		0
@@ -161,7 +157,6 @@
 	#define HAS_BEEP		0
 	#define HAS_GPS			0
 	#define HAS_SERIAL_1		0
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
 	#define HAS_LOG			1
@@ -188,7 +183,6 @@
 	#define HAS_BEEP		0
 	#define HAS_GPS			0
 	#define HAS_SERIAL_1		0
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
 	#define HAS_LOG			1
@@ -214,7 +208,6 @@
 	#define HAS_BEEP		1
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			1
 	#define HAS_DBG			0
 	#define HAS_EEPROM		1
@@ -244,7 +237,6 @@
 	#define HAS_USB			1
 	#define HAS_BEEP		0
 	#define HAS_SERIAL_1		0
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			0
 	#define HAS_DBG			0
 	#define HAS_EEPROM		0
@@ -273,7 +265,6 @@
 	#define HAS_USB			1
 	#define HAS_BEEP		0
 	#define HAS_SERIAL_1		0
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			0
 	#define HAS_DBG			1
 	#define HAS_EEPROM		0
@@ -301,7 +292,8 @@
 	#define HAS_USB			1
 	#define HAS_BEEP		0
 	#define HAS_SERIAL_1		1
-	#define USE_SERIAL_STDIN	1
+	#define USE_SERIAL_1_STDIN	1
+	#define DELAY_SERIAL_1_STDIN	1
 	#define HAS_ADC			0
 	#define HAS_DBG			1
 	#define HAS_EEPROM		0
@@ -339,7 +331,8 @@
 	#define HAS_SERIAL_1_ALT_1	1
 	#define HAS_SERIAL_1_ALT_2	0
 	#define HAS_SERIAL_1_HW_FLOW	1
-	#define USE_SERIAL_STDIN	1
+	#define USE_SERIAL_1_STDIN	1
+	#define DELAY_SERIAL_1_STDIN	1
 	#define HAS_ADC			0
 	#define HAS_DBG			1
 	#define HAS_EEPROM		1
@@ -379,7 +372,6 @@
 	#define HAS_BEEP		1
 	#define HAS_GPS			0
 	#define HAS_SERIAL_1		1
-	#define USE_SERIAL_STDIN	0
 	#define HAS_ADC			1
 	#define HAS_DBG			0
 	#define HAS_EEPROM		1
@@ -468,14 +460,6 @@
 #error Please define IGNITE_ON_P0
 #endif
 
-#ifndef HAS_SERIAL_1
-#error Please define HAS_SERIAL_1
-#endif
-
-#ifndef USE_SERIAL_STDIN
-#error Please define USE_SERIAL_STDIN
-#endif
-
 #ifndef HAS_ADC
 #error Please define HAS_ADC
 #endif
diff --git a/src/cc1111/ao_serial.c b/src/cc1111/ao_serial.c
index 4d5b9abd..00c85ff3 100644
--- a/src/cc1111/ao_serial.c
+++ b/src/cc1111/ao_serial.c
@@ -17,78 +17,168 @@
 
 #include "ao.h"
 
-volatile __xdata struct ao_fifo	ao_usart1_rx_fifo;
-volatile __xdata struct ao_fifo	ao_usart1_tx_fifo;
+#if HAS_SERIAL_0
+
+volatile __xdata struct ao_fifo	ao_serial0_rx_fifo;
+volatile __xdata struct ao_fifo	ao_serial0_tx_fifo;
+
+void
+ao_serial0_rx_isr(void) __interrupt 2
+{
+	if (!ao_fifo_full(ao_serial0_rx_fifo))
+		ao_fifo_insert(ao_serial0_rx_fifo, U0DBUF);
+	ao_wakeup(&ao_serial0_rx_fifo);
+#if USE_SERIAL_0_STDIN
+	ao_wakeup(&ao_stdin_ready);
+#endif
+}
+
+static __xdata uint8_t ao_serial0_tx_started;
+
+static void
+ao_serial0_tx_start(void)
+{
+	if (!ao_fifo_empty(ao_serial0_tx_fifo) &&
+	    !ao_serial0_tx_started)
+	{
+		ao_serial0_tx_started = 1;
+		ao_fifo_remove(ao_serial0_tx_fifo, U0DBUF);
+	}
+}
+
+void
+ao_serial0_tx_isr(void) __interrupt 7
+{
+	UTX0IF = 0;
+	ao_serial0_tx_started = 0;
+	ao_serial0_tx_start();
+	ao_wakeup(&ao_serial0_tx_fifo);
+}
+
+char
+ao_serial0_getchar(void) __critical
+{
+	char	c;
+	while (ao_fifo_empty(ao_serial0_rx_fifo))
+		ao_sleep(&ao_serial0_rx_fifo);
+	ao_fifo_remove(ao_serial0_rx_fifo, c);
+	return c;
+}
+
+#if USE_SERIAL_0_STDIN
+char
+ao_serial0_pollchar(void) __critical
+{
+	char	c;
+	if (ao_fifo_empty(ao_serial0_rx_fifo))
+		return AO_READ_AGAIN;
+	ao_fifo_remove(ao_serial0_rx_fifo,c);
+	return c;
+}
+#endif
+
+void
+ao_serial0_putchar(char c) __critical
+{
+	while (ao_fifo_full(ao_serial0_tx_fifo))
+		ao_sleep(&ao_serial0_tx_fifo);
+	ao_fifo_insert(ao_serial0_tx_fifo, c);
+	ao_serial0_tx_start();
+}
+
+void
+ao_serial0_drain(void) __critical
+{
+	while (!ao_fifo_empty(ao_serial0_tx_fifo))
+		ao_sleep(&ao_serial0_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;
+}
+#endif /* HAS_SERIAL_0 */
+
+#if HAS_SERIAL_1
+
+volatile __xdata struct ao_fifo	ao_serial1_rx_fifo;
+volatile __xdata struct ao_fifo	ao_serial1_tx_fifo;
 
 void
-ao_serial_rx1_isr(void) __interrupt 3
+ao_serial1_rx_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
+	if (!ao_fifo_full(ao_serial1_rx_fifo))
+		ao_fifo_insert(ao_serial1_rx_fifo, U1DBUF);
+	ao_wakeup(&ao_serial1_rx_fifo);
+#if USE_SERIAL1_STDIN
 	ao_wakeup(&ao_stdin_ready);
 #endif
 }
 
-static __xdata uint8_t ao_serial_tx1_started;
+static __xdata uint8_t ao_serial1_tx_started;
 
 static void
-ao_serial_tx1_start(void)
+ao_serial1_tx_start(void)
 {
-	if (!ao_fifo_empty(ao_usart1_tx_fifo) &&
-	    !ao_serial_tx1_started)
+	if (!ao_fifo_empty(ao_serial1_tx_fifo) &&
+	    !ao_serial1_tx_started)
 	{
-		ao_serial_tx1_started = 1;
-		ao_fifo_remove(ao_usart1_tx_fifo, U1DBUF);
+		ao_serial1_tx_started = 1;
+		ao_fifo_remove(ao_serial1_tx_fifo, U1DBUF);
 	}
 }
 
 void
-ao_serial_tx1_isr(void) __interrupt 14
+ao_serial1_tx_isr(void) __interrupt 14
 {
 	UTX1IF = 0;
-	ao_serial_tx1_started = 0;
-	ao_serial_tx1_start();
-	ao_wakeup(&ao_usart1_tx_fifo);
+	ao_serial1_tx_started = 0;
+	ao_serial1_tx_start();
+	ao_wakeup(&ao_serial1_tx_fifo);
 }
 
 char
-ao_serial_getchar(void) __critical
+ao_serial1_getchar(void) __critical
 {
 	char	c;
-	while (ao_fifo_empty(ao_usart1_rx_fifo))
-		ao_sleep(&ao_usart1_rx_fifo);
-	ao_fifo_remove(ao_usart1_rx_fifo, c);
+	while (ao_fifo_empty(ao_serial1_rx_fifo))
+		ao_sleep(&ao_serial1_rx_fifo);
+	ao_fifo_remove(ao_serial1_rx_fifo, c);
 	return c;
 }
 
-#if USE_SERIAL_STDIN
+#if USE_SERIAL_1_STDIN
 char
-ao_serial_pollchar(void) __critical
+ao_serial1_pollchar(void) __critical
 {
 	char	c;
-	if (ao_fifo_empty(ao_usart1_rx_fifo))
+	if (ao_fifo_empty(ao_serial1_rx_fifo))
 		return AO_READ_AGAIN;
-	ao_fifo_remove(ao_usart1_rx_fifo,c);
+	ao_fifo_remove(ao_serial1_rx_fifo,c);
 	return c;
 }
 #endif
 
 void
-ao_serial_putchar(char c) __critical
+ao_serial1_putchar(char c) __critical
 {
-	while (ao_fifo_full(ao_usart1_tx_fifo))
-		ao_sleep(&ao_usart1_tx_fifo);
-	ao_fifo_insert(ao_usart1_tx_fifo, c);
-	ao_serial_tx1_start();
+	while (ao_fifo_full(ao_serial1_tx_fifo))
+		ao_sleep(&ao_serial1_tx_fifo);
+	ao_fifo_insert(ao_serial1_tx_fifo, c);
+	ao_serial1_tx_start();
 }
 
 void
-ao_serial_drain(void) __critical
+ao_serial1_drain(void) __critical
 {
-	while (!ao_fifo_empty(ao_usart1_tx_fifo))
-		ao_sleep(&ao_usart1_tx_fifo);
+	while (!ao_fifo_empty(ao_serial1_tx_fifo))
+		ao_sleep(&ao_serial1_tx_fifo);
 }
 
 const __code struct ao_serial_speed ao_serial_speeds[] = {
@@ -111,9 +201,9 @@ const __code struct ao_serial_speed ao_serial_speeds[] = {
 };
 
 void
-ao_serial_set_speed(uint8_t speed)
+ao_serial1_set_speed(uint8_t speed)
 {
-	ao_serial_drain();
+	ao_serial1_drain();
 	if (speed > AO_SERIAL_SPEED_57600)
 		return;
 	U1UCR |= UxUCR_FLUSH;
@@ -121,9 +211,67 @@ ao_serial_set_speed(uint8_t speed)
 	U1GCR = ao_serial_speeds[speed].gcr;
 }
 
+#endif /* HAS_SERIAL_1 */
+
 void
 ao_serial_init(void)
 {
+#if HAS_SERIAL_0
+#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;
+#if USE_SERIAL_0_STDIN && !DELAY_SERIAL_0_STDIN
+	ao_add_stdio(ao_serial0_pollchar,
+		     ao_serial0_putchar,
+		     NULL);
+#endif
+#endif /* HAS_SERIAL_0 */
+
+#if HAS_SERIAL_1
 #if HAS_SERIAL_1_ALT_1
 	/* Set up the USART pin assignment */
 	PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_1;
@@ -151,7 +299,7 @@ ao_serial_init(void)
 	U1CSR = (UxCSR_MODE_UART | UxCSR_RE);
 
 	/* Pick a 4800 baud rate */
-	ao_serial_set_speed(AO_SERIAL_SPEED_4800);
+	ao_serial1_set_speed(AO_SERIAL_SPEED_4800);
 
 	/* Reasonable serial parameters */
 	U1UCR = (UxUCR_FLUSH |
@@ -169,4 +317,11 @@ ao_serial_init(void)
 
 	IEN0 |= IEN0_URX1IE;
 	IEN2 |= IEN2_UTX1IE;
+
+#if USE_SERIAL_1_STDIN && !DELAY_SERIAL_1_STDIN
+	ao_add_stdio(ao_serial1_pollchar,
+		     ao_serial1_putchar,
+		     NULL);
+#endif
+#endif /* HAS_SERIAL_1 */
 }
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;
-}
diff --git a/src/cc1111/ao_usb.c b/src/cc1111/ao_usb.c
index 35c9ac20..ce26e808 100644
--- a/src/cc1111/ao_usb.c
+++ b/src/cc1111/ao_usb.c
@@ -261,15 +261,15 @@ ao_usb_ep0_setup(void)
 		break;
 	case AO_USB_TYPE_CLASS:
 		switch (ao_usb_setup.request) {
-		case SET_LINE_CODING:
+		case AO_USB_SET_LINE_CODING:
 			ao_usb_ep0_out_len = 7;
 			ao_usb_ep0_out_data = (__xdata uint8_t *) &ao_usb_line_coding;
 			break;
-		case GET_LINE_CODING:
+		case AO_USB_GET_LINE_CODING:
 			ao_usb_ep0_in_len = 7;
 			ao_usb_ep0_in_data = (uint8_t *) &ao_usb_line_coding;
 			break;
-		case SET_CONTROL_LINE_STATE:
+		case AO_USB_SET_CONTROL_LINE_STATE:
 			break;
 		}
 		break;
diff --git a/src/cc1111/ao_usb.h b/src/cc1111/ao_usb.h
deleted file mode 100644
index 6633dafc..00000000
--- a/src/cc1111/ao_usb.h
+++ /dev/null
@@ -1,100 +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.
- */
-
-#ifndef _AO_USB_H_
-#define _AO_USB_H_
-
-#define AO_USB_SETUP_DIR_MASK	(0x01 << 7)
-#define AO_USB_SETUP_TYPE_MASK	(0x03 << 5)
-#define AO_USB_SETUP_RECIP_MASK	(0x1f)
-
-#define AO_USB_DIR_OUT			0
-#define AO_USB_DIR_IN			(1 << 7)
-
-#define AO_USB_TYPE_STANDARD		0
-#define AO_USB_TYPE_CLASS		(1 << 5)
-#define AO_USB_TYPE_VENDOR		(2 << 5)
-#define AO_USB_TYPE_RESERVED		(3 << 5)
-
-#define AO_USB_RECIP_DEVICE		0
-#define AO_USB_RECIP_INTERFACE		1
-#define AO_USB_RECIP_ENDPOINT		2
-#define AO_USB_RECIP_OTHER		3
-
-/* standard requests */
-#define	AO_USB_REQ_GET_STATUS		0x00
-#define AO_USB_REQ_CLEAR_FEATURE	0x01
-#define AO_USB_REQ_SET_FEATURE		0x03
-#define AO_USB_REQ_SET_ADDRESS		0x05
-#define AO_USB_REQ_GET_DESCRIPTOR	0x06
-#define AO_USB_REQ_SET_DESCRIPTOR	0x07
-#define AO_USB_REQ_GET_CONFIGURATION	0x08
-#define AO_USB_REQ_SET_CONFIGURATION	0x09
-#define AO_USB_REQ_GET_INTERFACE	0x0A
-#define AO_USB_REQ_SET_INTERFACE	0x0B
-#define AO_USB_REQ_SYNCH_FRAME		0x0C
-
-#define AO_USB_DESC_DEVICE		1
-#define AO_USB_DESC_CONFIGURATION	2
-#define AO_USB_DESC_STRING		3
-#define AO_USB_DESC_INTERFACE		4
-#define AO_USB_DESC_ENDPOINT		5
-#define AO_USB_DESC_DEVICE_QUALIFIER	6
-#define AO_USB_DESC_OTHER_SPEED		7
-#define AO_USB_DESC_INTERFACE_POWER	8
-
-#define AO_USB_GET_DESC_TYPE(x)		(((x)>>8)&0xFF)
-#define AO_USB_GET_DESC_INDEX(x)	((x)&0xFF)
-
-#define AO_USB_CONTROL_EP	0
-#define AO_USB_INT_EP		1
-#define AO_USB_OUT_EP		4
-#define AO_USB_IN_EP		5
-#define AO_USB_CONTROL_SIZE	32
-/*
- * Double buffer IN and OUT EPs, so each
- * gets half of the available space
- *
- * Ah, but USB bulk packets can only come in 8, 16, 32 and 64
- * byte sizes, so we'll use 64 for everything
- */
-#define AO_USB_IN_SIZE		64
-#define AO_USB_OUT_SIZE		64
-
-#define AO_USB_EP0_IDLE		0
-#define AO_USB_EP0_DATA_IN	1
-#define AO_USB_EP0_DATA_OUT	2
-
-#define LE_WORD(x)    ((x)&0xFF),((uint8_t) (((uint16_t) (x))>>8))
-
-/* CDC definitions */
-#define CS_INTERFACE      0x24
-#define CS_ENDPOINT       0x25
-
-#define SET_LINE_CODING         0x20
-#define GET_LINE_CODING         0x21
-#define SET_CONTROL_LINE_STATE  0x22
-
-/* Data structure for GET_LINE_CODING / SET_LINE_CODING class requests */
-struct ao_usb_line_coding {
-	uint32_t	rate;
-	uint8_t		char_format;
-	uint8_t		parity;
-	uint8_t		data_bits;
-} ;
-
-#endif /* _AO_USB_H_ */