projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lpc: Fix name of timer ioconf for pio0_1
[fw/altos]
/
src
/
lpc
/
ao_serial_lpc.c
diff --git
a/src/lpc/ao_serial_lpc.c
b/src/lpc/ao_serial_lpc.c
index 0011744d2e931258e1c76898d2a2a8f7e8e86cc4..db0e0b0c55a3f2e22513439a4acf2a8a961b239c 100644
(file)
--- a/
src/lpc/ao_serial_lpc.c
+++ b/
src/lpc/ao_serial_lpc.c
@@
-54,7
+54,7
@@
lpc_usart_isr(void)
(void) lpc_usart.iir_fcr;
while (lpc_usart.lsr & (1 << LPC_USART_LSR_RDR)) {
(void) lpc_usart.iir_fcr;
while (lpc_usart.lsr & (1 << LPC_USART_LSR_RDR)) {
- char c = lpc_usart.rbr_thr;
+ char c =
(char)
lpc_usart.rbr_thr;
if (!ao_fifo_full(ao_usart_rx_fifo))
ao_fifo_insert(ao_usart_rx_fifo, c);
wake_input = 1;
if (!ao_fifo_full(ao_usart_rx_fifo))
ao_fifo_insert(ao_usart_rx_fifo, c);
wake_input = 1;
@@
-66,8
+66,9
@@
lpc_usart_isr(void)
}
if (wake_input) {
ao_wakeup(&ao_usart_rx_fifo);
}
if (wake_input) {
ao_wakeup(&ao_usart_rx_fifo);
- if (stdin)
- ao_wakeup(&ao_stdin_ready);
+#if USE_SERIAL_0_STDIN
+ ao_wakeup(&ao_stdin_ready);
+#endif
}
}
}
}
@@
-134,11
+135,11
@@
ao_serial0_set_speed(uint8_t speed)
/* DL MSB */
lpc_usart.ier = (ao_usart_speeds[speed].dl >> 8) & 0xff;
/* DL MSB */
lpc_usart.ier = (ao_usart_speeds[speed].dl >> 8) & 0xff;
- lpc_usart.fdr = ((ao_usart_speeds[speed].divaddval << LPC_USART_FDR_DIVADDVAL) |
- (ao_usart_speeds[speed].mulval << LPC_USART_FDR_MULVAL));
+ lpc_usart.fdr = ((
(uint32_t)
ao_usart_speeds[speed].divaddval << LPC_USART_FDR_DIVADDVAL) |
+ (
(uint32_t)
ao_usart_speeds[speed].mulval << LPC_USART_FDR_MULVAL));
/* Turn access to divisor latches back off */
/* Turn access to divisor latches back off */
- lpc_usart.lcr &= ~(1 << LPC_USART_LCR_DLAB);
+ lpc_usart.lcr &= ~(1
UL
<< LPC_USART_LCR_DLAB);
}
void
}
void