altos/lpc: Add casts to reduce -Wconversion warnings

[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 431ae98a784e61aca1ca09590a8b29b334b77957..db0e0b0c55a3f2e22513439a4acf2a8a961b239c 100644 (file)
--- 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
@@ -53,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;
@@ -65,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
        }
 }
 
@@ -133,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
@@ -206,8 +208,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
 }