From 41a6e7c4abf3a2afc6695fc77dfb1f57ce3bebfa Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 10 Mar 2016 22:39:51 +0100
Subject: [PATCH] Visual C++ compilation fixes

---
 radio/src/gui/horus/widget.h           | 10 +++++-----
 radio/src/gui/horus/widgets/text.cpp   |  2 +-
 radio/src/targets/simu/simpgmspace.cpp |  7 +++++--
 radio/src/targets/simu/simpgmspace.h   |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/radio/src/gui/horus/widget.h b/radio/src/gui/horus/widget.h
index 823a501a6..51afba753 100644
--- a/radio/src/gui/horus/widget.h
+++ b/radio/src/gui/horus/widget.h
@@ -41,15 +41,15 @@ union ZoneOptionValue
 };
 
 #if defined(_MSC_VER)
-  #define OPTION_DEFAULT_VALUE_UNSIGNED(x)    { uint32_t(x) }
-  #define OPTION_DEFAULT_VALUE_SIGNED(x)      { uint32_t(x) }
-  #define OPTION_DEFAULT_VALUE_BOOL(x)        { uint32_t(x) }
-  #define OPTION_DEFAULT_VALUE_STRING(...)      { *((ZoneOptionValue *)(const char []) __VA_ARGS__) }
+  #define OPTION_DEFAULT_VALUE_UNSIGNED(x)    uint32_t(x)
+  #define OPTION_DEFAULT_VALUE_SIGNED(x)      uint32_t(x)
+  #define OPTION_DEFAULT_VALUE_BOOL(x)        uint32_t(x)
+  #define OPTION_DEFAULT_VALUE_STRING(...)    *(ZoneOptionValue *)(const char *)__VA_ARGS__
 #else
   #define OPTION_DEFAULT_VALUE_UNSIGNED(x)    { .unsignedValue = (x) }
   #define OPTION_DEFAULT_VALUE_SIGNED(x)      { .signedValue = (x) }
   #define OPTION_DEFAULT_VALUE_BOOL(x)        { .boolValue = (x) }
-  #define OPTION_DEFAULT_VALUE_STRING(...)    { .stringValue = __VA_ARGS__}
+  #define OPTION_DEFAULT_VALUE_STRING(...)    { .stringValue = *(ZoneOptionValue *)(const char *)__VA_ARGS__ }
 #endif
 
 struct ZoneOption
diff --git a/radio/src/gui/horus/widgets/text.cpp b/radio/src/gui/horus/widgets/text.cpp
index 137035206..7239abc4c 100644
--- a/radio/src/gui/horus/widgets/text.cpp
+++ b/radio/src/gui/horus/widgets/text.cpp
@@ -34,7 +34,7 @@ class TextWidget: public Widget
 };
 
 const ZoneOption TextWidget::options[] = {
-  { "Text", ZoneOption::String, OPTION_DEFAULT_VALUE_STRING({ '\015', '\347', '\0', '\14', '\377', '\376', '\373', '\364' }) },
+  { "Text", ZoneOption::String, OPTION_DEFAULT_VALUE_STRING("\015\347\0\14\377\376\373\364") },
   { "Color", ZoneOption::Color, OPTION_DEFAULT_VALUE_UNSIGNED(RED) },
   { "Size", ZoneOption::TextSize, OPTION_DEFAULT_VALUE_UNSIGNED(0) },
   { NULL, ZoneOption::Bool }
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index c81f1c6fd..945d4a5be 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -48,7 +48,9 @@ const char *eepromFile = NULL;
 FILE *fp = NULL;
 int g_snapshot_idx = 0;
 
-pthread_t main_thread_pid = 0;
+#if !defined(CPUARM)
+pthread_t main_thread_pid;
+#endif
 uint8_t main_thread_running = 0;
 char * main_thread_error = NULL;
 
@@ -383,8 +385,9 @@ void StartSimu(bool tests)
 void StopSimu()
 {
   main_thread_running = 0;
-  if (main_thread_pid)
+#if !defined(CPUARM)
     pthread_join(main_thread_pid, NULL);
+#endif
 }
 
 #if defined(CPUARM)
diff --git a/radio/src/targets/simu/simpgmspace.h b/radio/src/targets/simu/simpgmspace.h
index 59212c8b4..75b04dca7 100644
--- a/radio/src/targets/simu/simpgmspace.h
+++ b/radio/src/targets/simu/simpgmspace.h
@@ -375,7 +375,7 @@ void eepromReadBlock (uint8_t * pointer_ram, uint32_t address, uint32_t size);
 extern OS_MutexID audioMutex;
 
 #define OS_FlagID uint32_t
-#define OS_TID uint32_t
+#define OS_TID pthread_t
 #define OS_TCID uint32_t
 #define OS_STK uint32_t