projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Oops. Serial 1 stdin was busted by typo
[fw/altos]
/
src
/
cc1111
/
ao_serial.c
diff --git
a/src/cc1111/ao_serial.c
b/src/cc1111/ao_serial.c
index d5431070d7b430ab8a2095460855a353ea2db3c3..4838380228214dcf7fe0e475bf493a89237bcc21 100644
(file)
--- 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 (!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
}
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);
/* 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);
P1SEL |= (1 << 5) | (1 << 4);
+#endif
#endif
/* UART mode with receiver enabled */
#endif
/* UART mode with receiver enabled */