From 5566439e7663499fc9bbee92561865617d6cbf54 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Thu, 4 Dec 2014 22:17:06 +0100
Subject: [PATCH] Fixed simu build

---
 radio/src/lcd.h          | 2 ++
 radio/src/lcd_common.cpp | 2 --
 radio/src/simu.cpp       | 2 +-
 radio/src/tasks_arm.cpp  | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/radio/src/lcd.h b/radio/src/lcd.h
index b28d18647..8f5a16801 100644
--- a/radio/src/lcd.h
+++ b/radio/src/lcd.h
@@ -168,9 +168,11 @@ extern display_t * displayBuf;
 #else
 extern display_t displayBuf[DISPLAY_BUF_SIZE];
 #endif
+
 extern coord_t lcdLastPos;
 extern coord_t lcdNextPos;
 
+#define DISPLAY_BUFER_SIZE     (sizeof(display_t)*DISPLAY_BUF_SIZE)
 #define DISPLAY_END            (displayBuf + DISPLAY_BUF_SIZE)
 #define ASSERT_IN_DISPLAY(p)   assert((p) >= displayBuf && (p) < DISPLAY_END)
 
diff --git a/radio/src/lcd_common.cpp b/radio/src/lcd_common.cpp
index e3adc9cc4..c46f8fa4f 100644
--- a/radio/src/lcd_common.cpp
+++ b/radio/src/lcd_common.cpp
@@ -41,10 +41,8 @@
 display_t displayBuf1[DISPLAY_BUF_SIZE];
 display_t displayBuf2[DISPLAY_BUF_SIZE];
 display_t * displayBuf = displayBuf1;
-#define DISPLAY_BUFER_SIZE  sizeof(displayBuf1)
 #else
 display_t displayBuf[DISPLAY_BUF_SIZE];
-#define DISPLAY_BUFER_SIZE  sizeof(displayBuf)
 #endif
 
 void lcd_clear()
diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp
index a0618d3e7..abdcd25b7 100644
--- a/radio/src/simu.cpp
+++ b/radio/src/simu.cpp
@@ -85,7 +85,7 @@ Open9xSim::Open9xSim(FXApp* a):
   FXMainWindow(a, "OpenTX Simu", NULL, NULL, DECOR_ALL, 20, 90, 0, 0)
 {
   firstTime = true;
-  memset(displayBuf, 0, sizeof(displayBuf));
+  memset(displayBuf, 0, DISPLAY_BUFER_SIZE);
   bmp = new FXPPMImage(getApp(),NULL,IMAGE_OWNED|IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP, W2, H2);
 
   FXHorizontalFrame *hf11=new FXHorizontalFrame(this,LAYOUT_CENTER_X);
diff --git a/radio/src/tasks_arm.cpp b/radio/src/tasks_arm.cpp
index cafc9c1fb..8472ac56f 100644
--- a/radio/src/tasks_arm.cpp
+++ b/radio/src/tasks_arm.cpp
@@ -117,6 +117,8 @@ uint32_t stack_free(uint32_t tid)
   return i*4;
 }
 
+#if !defined(SIMU)
+
 void mixerTask(void * pdata)
 {
   s_pulses_paused = true;
@@ -209,3 +211,5 @@ void tasksStart()
 
   CoStartOS();
 }
+
+#endif // #if !defined(SIMU)
\ No newline at end of file