X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_serial_lpc.c;h=1a833b3860d22d3268a772124dd01cff5ddbf016;hb=68c3a1f238be808b23573dbd19bcfc135d25bd03;hp=d6b0082a093c400498b1013230efcc03854db3d4;hpb=c542a2ed0f222bd0ec84e4a9651585d441dd7ccf;p=fw%2Faltos

diff --git a/src/lpc/ao_serial_lpc.c b/src/lpc/ao_serial_lpc.c
index d6b0082a..1a833b38 100644
--- a/src/lpc/ao_serial_lpc.c
+++ b/src/lpc/ao_serial_lpc.c
@@ -3,7 +3,8 @@
  *
  * 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
@@ -49,21 +50,26 @@ _ao_serial_tx_start(void)
 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
@@ -129,11 +135,11 @@ ao_serial0_set_speed(uint8_t speed)
 	/* 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
@@ -151,6 +157,18 @@ ao_serial_init(void)
 			      (0 << LPC_IOCONF_INV) |
 			      (0 << LPC_IOCONF_OD));
 #endif
+#if 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));
+#endif
 
 	/* Turn on the USART */
 	lpc_scb.sysahbclkctrl |= (1 << LPC_SCB_SYSAHBCLKCTRL_USART);
@@ -202,8 +220,8 @@ ao_serial_init(void)
 	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
 }