From 404cab25484b7e8064b331c973acd09bd7637ebf Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 28 Aug 2015 14:57:10 +0200
Subject: [PATCH] Bootloader compilation fix

---
 radio/src/gui/Taranis/lcd.cpp | 4 ++--
 radio/src/gui/Taranis/lcd.h   | 4 ++--
 radio/src/myeeprom.h          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp
index 27d940f6f..a5a3a7156 100755
--- a/radio/src/gui/Taranis/lcd.cpp
+++ b/radio/src/gui/Taranis/lcd.cpp
@@ -727,7 +727,7 @@ void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att)
   }
 }
 
-void putsSwitches(coord_t x, coord_t y, swsrc_t idx, LcdFlags att)
+void putsSwitches(coord_t x, coord_t y, int32_t idx, LcdFlags att)
 {
   if (idx == SWSRC_OFF)
     return lcd_putsiAtt(x, y, STR_OFFON, 0, att);
@@ -803,7 +803,7 @@ void putsCurve(coord_t x, coord_t y, int8_t idx, LcdFlags att)
   putsStrIdx(x, y, STR_CV, idx, att);
 }
 
-void putsTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att)
+void putsTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att)
 {
   if (mode >= 0) {
     if (mode < TMRMODE_COUNT)
diff --git a/radio/src/gui/Taranis/lcd.h b/radio/src/gui/Taranis/lcd.h
index ffc1dee4b..a5342efb8 100755
--- a/radio/src/gui/Taranis/lcd.h
+++ b/radio/src/gui/Taranis/lcd.h
@@ -167,7 +167,7 @@ void lcd_outdez8(coord_t x, coord_t y, int8_t val);
 
 void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att=0);
 void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att);
-void putsSwitches(coord_t x, coord_t y, swsrc_t swtch, LcdFlags att=0);
+void putsSwitches(coord_t x, coord_t y, int32_t swtch, LcdFlags att=0);
 void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0);
 void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att=0);
 void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
@@ -175,7 +175,7 @@ void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
 void putsCurveRef(coord_t x, coord_t y, CurveRef &curve, LcdFlags att);
 #endif
 void putsCurve(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
-void putsTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att=0);
+void putsTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att=0);
 void putsTrimMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, LcdFlags att);
 
 #define putsChn(x, y, idx, att) putsMixerSource(x, y, MIXSRC_CH1+idx-1, att)
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index bfd56ee68..5d9471117 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -203,7 +203,7 @@ PACK(typedef struct {
 }) CurveInfo;
 #else
 struct CurveInfo {
-  int8_t *crv;
+  int8_t * crv;
   uint8_t points;
   bool custom;
 };