altosui: Add config and pyro tabs to graph widget

[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..2362c67421774f77a73b08c63afc8d5ee5147f36 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)) {
-               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;
@@ -66,8 +66,9 @@ lpc_usart_isr(void)
        }
        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;
 
-       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
@@ -155,6 +156,19 @@ ao_serial_init(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 */