From f8203b72f70967d93260ea90faf8a8e62c3b3c93 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sun, 7 Dec 2014 10:12:26 +0100
Subject: [PATCH] perMainArm() renamed to perMain()

---
 radio/src/main_arm.cpp                 |  2 +-
 radio/src/opentx.h                     | 22 ++++++++++------------
 radio/src/targets/simu/simpgmspace.cpp |  4 +---
 radio/src/tasks_arm.cpp                |  2 +-
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/radio/src/main_arm.cpp b/radio/src/main_arm.cpp
index 9707d123a..d8427d854 100644
--- a/radio/src/main_arm.cpp
+++ b/radio/src/main_arm.cpp
@@ -97,7 +97,7 @@ void checkEeprom()
   }
 }
 
-void perMainArm()
+void perMain()
 {
 #if defined(PCBSKY9X) && !defined(REVA)
   calcConsumption();
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 1e25023fe..2d6297d3e 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -727,11 +727,9 @@ void evalMixes(uint8_t tick10ms);
 void doMixerCalculations();
 
 #if defined(CPUARM)
-void perMainArm();
-void checkTrims();
-#else
-void perMain();
+  void checkTrims();
 #endif
+void perMain();
 NOINLINE void per10ms();
 
 getvalue_t getValue(mixsrc_t i);
@@ -747,15 +745,15 @@ void logicalSwitchesTimerTick();
 void logicalSwitchesReset();
 
 #if defined(CPUARM)
-void evalLogicalSwitches(bool isCurrentPhase=true);
-void logicalSwitchesCopyState(uint8_t src, uint8_t dst);
-#define LS_RECURSIVE_EVALUATION_RESET()
+  void evalLogicalSwitches(bool isCurrentPhase=true);
+  void logicalSwitchesCopyState(uint8_t src, uint8_t dst);
+  #define LS_RECURSIVE_EVALUATION_RESET()
 #else
-#define evalLogicalSwitches(xxx)
-#define GETSWITCH_RECURSIVE_TYPE uint16_t
-extern volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_used;
-extern volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value;
-#define LS_RECURSIVE_EVALUATION_RESET() s_last_switch_used = 0
+  #define evalLogicalSwitches(xxx)
+  #define GETSWITCH_RECURSIVE_TYPE uint16_t
+  extern volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_used;
+  extern volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value;
+  #define LS_RECURSIVE_EVALUATION_RESET() s_last_switch_used = 0
 #endif
 
 #if defined(PCBTARANIS)
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index 487f661f6..c9ea5d762 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -342,10 +342,8 @@ void *main_thread(void *)
 #if defined(CPUARM)
       doMixerCalculations();
       checkTrims();
-      perMainArm();
-#else
-      perMain();
 #endif
+      perMain();
       sleep(10/*ms*/);
     }
 
diff --git a/radio/src/tasks_arm.cpp b/radio/src/tasks_arm.cpp
index 26fe67097..2e25744e7 100644
--- a/radio/src/tasks_arm.cpp
+++ b/radio/src/tasks_arm.cpp
@@ -160,7 +160,7 @@ void menusTask(void * pdata)
 
   while (pwrCheck() != e_power_off) {
     U64 start = CoGetOSTime();
-    perMainArm();
+    perMain();
     // TODO remove completely massstorage from sky9x firmware
     U32 runtime = (U32)(CoGetOSTime() - start);
     // deduct the thread run-time from the wait, if run-time was more than