From 60fc8c11b636d107399df45444c14dcf3876923e Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 24 Oct 2014 20:49:49 +0200
Subject: [PATCH] VC++ compilation fixes

---
 radio/src/eeprom_conversions.cpp         | 38 +++++++++++++-----------
 radio/src/targets/simu/simpgmspace.h     |  2 +-
 radio/src/targets/sky9x/audio_driver.cpp |  2 --
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index aea928db5..8b9412c2c 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -402,6 +402,26 @@ PACK(typedef struct {
 
 }) ModelData_v215;
 
+#if defined(PCBTARANIS)
+#define MODELDATA_EXTRA_216 \
+  uint8_t externalModule; \
+  uint8_t trainerMode; \
+  ModuleData moduleData[NUM_MODULES+1]; \
+  char curveNames[MAX_CURVES][6]; \
+  ScriptData_v216 scriptsData[MAX_SCRIPTS]; \
+  char inputNames[MAX_INPUTS][LEN_INPUT_NAME]; \
+  uint8_t nPotsToWarn; \
+  int8_t potPosition[NUM_POTS]; \
+  uint8_t spare[2];
+#elif defined(PCBSKY9X)
+#define MODELDATA_EXTRA_216 \
+  uint8_t externalModule; \
+  ModuleData moduleData[NUM_MODULES+1]; \
+  uint8_t nPotsToWarn; \
+  int8_t potPosition[NUM_POTS]; \
+  uint8_t rxBattAlarms[2];
+#endif
+
 PACK(typedef struct {
   ModelHeader header;
   TimerData_v216 timers[2];
@@ -441,23 +461,7 @@ PACK(typedef struct {
 
   FrSkyData_v216 frsky;
 
-#if defined(PCBTARANIS)
-  uint8_t externalModule;
-  uint8_t trainerMode;
-  ModuleData moduleData[NUM_MODULES+1];
-  char curveNames[MAX_CURVES][6];
-  ScriptData_v216 scriptsData[MAX_SCRIPTS];
-  char inputNames[MAX_INPUTS][LEN_INPUT_NAME];
-  uint8_t nPotsToWarn;
-  int8_t potPosition[NUM_POTS];
-  uint8_t spare[2];
-#elif defined(PCBSKY9X)
-  uint8_t externalModule;
-  ModuleData moduleData[NUM_MODULES+1];
-  uint8_t nPotsToWarn;
-  int8_t potPosition[NUM_POTS];
-  uint8_t rxBattAlarms[2];
-#endif
+  MODELDATA_EXTRA_216
 
 }) ModelData_v216;
 
diff --git a/radio/src/targets/simu/simpgmspace.h b/radio/src/targets/simu/simpgmspace.h
index 162fafef2..212983271 100644
--- a/radio/src/targets/simu/simpgmspace.h
+++ b/radio/src/targets/simu/simpgmspace.h
@@ -382,7 +382,7 @@ extern OS_MutexID audioMutex;
 
 #define CoInitOS(...)
 #define CoStartOS(...)
-#define CoCreateTask(...) sleep(1/*ms*/)
+#define CoCreateTask(...) (0)
 #define CoCreateMutex(...) PTHREAD_MUTEX_INITIALIZER
 #define CoSetFlag(...)
 #define CoClearFlag(...)
diff --git a/radio/src/targets/sky9x/audio_driver.cpp b/radio/src/targets/sky9x/audio_driver.cpp
index ce6868e46..4cfe0b25b 100644
--- a/radio/src/targets/sky9x/audio_driver.cpp
+++ b/radio/src/targets/sky9x/audio_driver.cpp
@@ -107,7 +107,6 @@ bool dacQueue(AudioBuffer *buffer)
   return false;
 }
 
-#pragma GCC optimize ("O1")
 extern "C" void DAC_IRQHandler()
 {
   AudioBuffer *nextBuffer = audioQueue.getNextFilledBuffer();
@@ -119,7 +118,6 @@ extern "C" void DAC_IRQHandler()
     dacStop();
   }
 }
-#pragma GCC optimize ("O2")
 
 // Sound routines
 void audioInit()