From 1fba706bdbd5b8c0a275a9d50a3bed23aad8ac27 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 27 Mar 2016 10:33:32 +0200
Subject: [PATCH] Compilation fixes

---
 radio/src/opentx.cpp                          |  2 +-
 radio/src/targets/9x/board_stock.cpp          | 42 +++++++++----------
 radio/src/targets/gruvin9x/board_gruvin9x.cpp |  2 +-
 radio/src/targets/mega2560/board_mega2560.cpp |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index d44aced1e..dabb7ea2c 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -921,7 +921,7 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
 #endif
 
 #if defined(FRSKY)&& !defined(CPUARM)
-FORCEINLINE void convertUnit(getvalue_t & val, uint8_t & unit)
+void convertUnit(getvalue_t & val, uint8_t & unit)
 {
   if (IS_IMPERIAL_ENABLE()) {
     if (unit == UNIT_TEMPERATURE) {
diff --git a/radio/src/targets/9x/board_stock.cpp b/radio/src/targets/9x/board_stock.cpp
index 05d39fca2..64824144f 100644
--- a/radio/src/targets/9x/board_stock.cpp
+++ b/radio/src/targets/9x/board_stock.cpp
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "../../opentx.h"
 
 #if defined(ROTARY_ENCODER_NAVIGATION)
@@ -279,7 +279,7 @@ uint8_t trimDown(uint8_t idx)
   return trimHelper(~PIND, idx);
 }
 
-FORCEINLINE void readKeysAndTrims()
+void readKeysAndTrims()
 {
   uint8_t enuk = KEY_MENU;
 
diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.cpp b/radio/src/targets/gruvin9x/board_gruvin9x.cpp
index 75dc10ff4..11d4f5d2e 100644
--- a/radio/src/targets/gruvin9x/board_gruvin9x.cpp
+++ b/radio/src/targets/gruvin9x/board_gruvin9x.cpp
@@ -240,7 +240,7 @@ uint8_t trimDown(uint8_t idx)
   return (in & pgm_read_byte(crossTrim+idx));
 }
 
-FORCEINLINE void readKeysAndTrims()
+void readKeysAndTrims()
 {
   uint8_t enuk = KEY_MENU;
 
diff --git a/radio/src/targets/mega2560/board_mega2560.cpp b/radio/src/targets/mega2560/board_mega2560.cpp
index 1496e3f60..8cd8e97c4 100644
--- a/radio/src/targets/mega2560/board_mega2560.cpp
+++ b/radio/src/targets/mega2560/board_mega2560.cpp
@@ -165,7 +165,7 @@ uint8_t trimDown(uint8_t idx)
   return (in & pgm_read_byte(crossTrim+idx));
 }
 
-FORCEINLINE void readKeysAndTrims()
+void readKeysAndTrims()
 {
   uint8_t enuk = KEY_MENU;