From cf7e45d7cd810a3edc0471b02b58b6df6229f87d Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 3 Jan 2020 12:32:14 +0100
Subject: [PATCH] #7210 merged (thanks Fiam)

---
 radio/src/opentx.cpp              |  8 ++++++++
 radio/src/opentx.h                |  2 +-
 radio/src/syscalls.c              | 17 ++++++++---------
 radio/src/targets/horus/board.cpp |  8 --------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 3bf65563f..5805f3161 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1979,12 +1979,20 @@ void opentxInit()
   WDG_ENABLE(WDG_DURATION);
 }
 
+#if defined(SEMIHOSTING)
+extern "C" void initialise_monitor_handles();
+#endif
+
 #if defined(SIMU)
 void simuMain()
 #else
 int main()
 #endif
 {
+#if defined(SEMIHOSTING)
+  initialise_monitor_handles();
+#endif
+
 #if defined(STM32)
   TRACE("reusableBuffer: modelSel=%d, moduleSetup=%d, calib=%d, sdManager=%d, hardwareAndSettings=%d, spectrumAnalyser=%d, usb=%d",
         sizeof(reusableBuffer.modelsel),
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index addf87c1a..f7e0b411f 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -481,7 +481,7 @@ extern uint8_t flightModeTransitionLast;
 
 #if defined(SIMU)
   inline int availableMemory() { return 1000; }
-#elif !defined(SIMU)
+#else
   extern unsigned char *heap;
   extern int _end;
   extern int _heap_end;
diff --git a/radio/src/syscalls.c b/radio/src/syscalls.c
index b80ae58e9..369566877 100644
--- a/radio/src/syscalls.c
+++ b/radio/src/syscalls.c
@@ -73,7 +73,7 @@ extern int _close(int file)
 
 extern int _fstat(int file, struct stat * st)
 {
-  st->st_mode = S_IFCHR ;
+  st->st_mode = S_IFCHR;
   return 0;
 }
 
@@ -97,6 +97,12 @@ extern int _write(int file, char *ptr, int len)
   return 0;
 }
 
+extern int _getpid()
+{
+  return -1;
+}
+#endif
+
 extern void _exit(int status)
 {
   TRACE("_exit(%d)", status);
@@ -105,12 +111,5 @@ extern void _exit(int status)
 
 extern void _kill(int pid, int sig)
 {
-  return ;
+  return;
 }
-
-extern int _getpid()
-{
-    return -1 ;
-}
-#endif
-
diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp
index 048817c69..ac6e4e1f8 100644
--- a/radio/src/targets/horus/board.cpp
+++ b/radio/src/targets/horus/board.cpp
@@ -41,10 +41,6 @@ void watchdogInit(unsigned int duration)
   IWDG->KR = 0xCCCC;      // start
 }
 
-#if defined(SEMIHOSTING)
-extern "C" void initialise_monitor_handles();
-#endif
-
 #if defined(PCBX10) && !defined(RADIO_T16)
 void sportUpdateInit()
 {
@@ -70,10 +66,6 @@ void sportUpdatePowerOff()
 
 void boardInit()
 {
-#if defined(SEMIHOSTING)
-  initialise_monitor_handles();
-#endif
-
   RCC_AHB1PeriphClockCmd(PWR_RCC_AHB1Periph |
                          PCBREV_RCC_AHB1Periph |
                          LED_RCC_AHB1Periph |