*
* 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
void
lpc_usart_isr(void)
{
+ uint8_t wake_input = 0;
(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);
- ao_wakeup(&ao_usart_rx_fifo);
- if (stdin)
- ao_wakeup(&ao_stdin_ready);
+ wake_input = 1;
}
if (lpc_usart.lsr & (1 << LPC_USART_LSR_THRE)) {
ao_usart_tx_avail = LPC_USART_TX_FIFO_SIZE;
_ao_serial_tx_start();
ao_wakeup(&ao_usart_tx_fifo);
}
+ if (wake_input) {
+ ao_wakeup(&ao_usart_rx_fifo);
+#if USE_SERIAL_0_STDIN
+ ao_wakeup(&ao_stdin_ready);
+#endif
+ }
}
int
-_ao_serial_pollchar(void)
+_ao_serial0_pollchar(void)
{
int c;
}
char
-ao_serial_getchar(void)
+ao_serial0_getchar(void)
{
int c;
ao_arch_block_interrupts();
- while ((c = _ao_serial_pollchar()) == AO_READ_AGAIN)
+ while ((c = _ao_serial0_pollchar()) == AO_READ_AGAIN)
ao_sleep(&ao_usart_rx_fifo);
ao_arch_release_interrupts();
return (char) c;
}
void
-ao_serial_putchar(char c)
+ao_serial0_putchar(char c)
{
ao_arch_block_interrupts();
while (ao_fifo_full(ao_usart_tx_fifo))
}
void
-ao_serial_drain(void)
+ao_serial0_drain(void)
{
ao_arch_block_interrupts();
while (!ao_fifo_empty(ao_usart_tx_fifo))
#include "ao_serial_lpc.h"
void
-ao_serial_set_speed(uint8_t speed)
+ao_serial0_set_speed(uint8_t speed)
{
if (speed > AO_SERIAL_SPEED_115200)
return;
/* 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 */
- lpc_usart.lcr &= ~(1 << LPC_USART_LCR_DLAB);
+ lpc_usart.lcr &= ~(1UL << LPC_USART_LCR_DLAB);
}
void
(0 << LPC_IOCONF_HYS) |
(0 << LPC_IOCONF_INV) |
(0 << LPC_IOCONF_OD));
+#elif SERIAL_1_13_14
+ lpc_ioconf.pio1_13 = ((LPC_IOCONF_FUNC_PIO1_13_TXD << LPC_IOCONF_FUNC) |
+ (LPC_IOCONF_MODE_INACTIVE << LPC_IOCONF_MODE) |
+ (0 << LPC_IOCONF_HYS) |
+ (0 << LPC_IOCONF_INV) |
+ (0 << LPC_IOCONF_OD));
+ lpc_ioconf.pio1_14 = ((LPC_IOCONF_FUNC_PIO1_14_RXD << LPC_IOCONF_FUNC) |
+ (LPC_IOCONF_MODE_INACTIVE << LPC_IOCONF_MODE) |
+ (0 << LPC_IOCONF_HYS) |
+ (0 << LPC_IOCONF_INV) |
+ (0 << LPC_IOCONF_OD));
+#else
+#error No serial pin configuration selected
#endif
/* Turn on the USART */
lpc_usart.hden = ((0 << LPC_USART_HDEN_HDEN));
/* Set baud rate */
- ao_serial_set_speed(AO_SERIAL_SPEED_9600);
+ ao_serial0_set_speed(AO_SERIAL_SPEED_9600);
/* Enable interrupts */
lpc_usart.ier = ((1 << LPC_USART_IER_RBRINTEN) |
lpc_nvic_set_enable(LPC_ISR_USART_POS);
lpc_nvic_set_priority(LPC_ISR_USART_POS, 0);
#if USE_SERIAL_0_STDIN
- ao_add_stdio(_ao_serial_pollchar,
- ao_serial_putchar,
+ ao_add_stdio(_ao_serial0_pollchar,
+ ao_serial0_putchar,
NULL);
#endif
}