altos/arm: Align data so that gcc 5.4 doesn't do byte-accesses. Add -Wcast-align

[fw/altos] / src / stm / ao_lcd_stm.c

diff --git a/src/stm/ao_lcd_stm.c b/src/stm/ao_lcd_stm.c
index 47ea374ed6070303b5b306db6cb1719e825ea891..10d5d620731497c599610fca601d9f5348d664b1 100644 (file)
--- a/src/stm/ao_lcd_stm.c
+++ b/src/stm/ao_lcd_stm.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
@@ -346,8 +347,7 @@ static const struct ao_cmds ao_lcd_stm_cmds[] = {
 void
 ao_lcd_stm_init(void)
 {
-       int s, c;
-       int r;
+       unsigned int s, c;
        uint32_t        csr;
 
        stm_rcc.ahbenr |= ((AO_LCD_STM_USES_GPIOA << STM_RCC_AHBENR_GPIOAEN) |