From: Keith Packard <keithp@keithp.com>
Date: Tue, 7 Aug 2012 18:30:47 +0000 (-0700)
Subject: altos: Oops. Serial 1 stdin was busted by typo
X-Git-Tag: 1.1~67^2~35^2~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c58f3d1a373b20fac3f51037008bcc40955f1348

altos: Oops. Serial 1 stdin was busted by typo

A typo in the symbol used to enable stdin wakeups from serial1 caused
the input to pend until some other wakeup occurred.

This also makes the serial1 hw flow control pin selects in config 2
work right, although those aren't used by any current product

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

diff --git a/src/cc1111/ao_serial.c b/src/cc1111/ao_serial.c
index d5431070..48383802 100644
--- a/src/cc1111/ao_serial.c
+++ b/src/cc1111/ao_serial.c
@@ -135,7 +135,7 @@ ao_serial1_rx_isr(void) __interrupt 3
 	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
+#if USE_SERIAL_1_STDIN
 	ao_wakeup(&ao_stdin_ready);
 #endif
 }
@@ -292,7 +292,9 @@ 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);
+#endif
 #endif
 
 	/* UART mode with receiver enabled */