From b6759d5434cc0ffc5289c40ec628e4370bf4d4f1 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 15 Jan 2016 12:42:37 +0100
Subject: [PATCH] [Horus] Compilation fix

---
 radio/src/switches.cpp                 |  2 +-
 radio/src/targets/simu/simpgmspace.cpp | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp
index 997572096..623ea62dd 100644
--- a/radio/src/switches.cpp
+++ b/radio/src/switches.cpp
@@ -774,7 +774,7 @@ void checkSwitches()
 #if defined(COLORLCD)
     for (int i=0; i<NUM_SWITCHES; i++) {
       if (SWITCH_WARNING_ALLOWED(i)) {
-        unsigned int state = ((g_model.switchWarningState >> (3*i)) & 0x07);
+        unsigned int state = ((states >> (3*i)) & 0x07);
         if (state && state-1 != ((switches_states >> (i*2)) & 0x03)) {
           warn = true;
         }
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index b8480adc1..bda3da4e2 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -444,7 +444,6 @@ void StopMainThread()
 }
 
 #if defined(CPUARM)
-
 struct SimulatorAudio {
   int volumeGain;
   int currentVolume;
@@ -454,19 +453,26 @@ struct SimulatorAudio {
   pthread_t threadPid;
 } simuAudio;
 
-bool dacQueue(AudioBuffer *buffer)
+bool dacQueue(AudioBuffer * buffer)
 {
   return false;
 }
+#endif
+
+#if defined(VOLUME_CHIP)
+void setScaledVolume(uint8_t volume)
+{
+  simuAudio.currentVolume = min<int>((volumeScale[min<uint8_t>(volume, VOLUME_LEVEL_MAX)] * simuAudio.volumeGain) / 10, 127);
+  // TRACE("setVolume(): in: %u, out: %u", volume, simuAudio.currentVolume);
+}
 
 void setVolume(uint8_t volume)
 {
 }
 
-void setScaledVolume(uint8_t volume)
+int32_t getVolume()
 {
-  simuAudio.currentVolume = min<int>((volumeScale[min<uint8_t>(volume, VOLUME_LEVEL_MAX)] * simuAudio.volumeGain) / 10, 127);
-  // TRACE("setVolume(): in: %u, out: %u", volume, simuAudio.currentVolume);
+  return 0;
 }
 #endif
 
@@ -1344,7 +1350,3 @@ void serialPrintf(const char * format, ...) { }
 void serialCrlf() { }
 void serialPutc(char c) { }
 uint16_t stackSize() { return 0; }
-
-#if defined(VOLUME_CHIP)
-int32_t getVolume() { return 0; }
-#endif
\ No newline at end of file