From b8ac51564ef19521388218d5bfc574bd43f0fec7 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 11 Dec 2015 15:12:50 +0100
Subject: [PATCH] Compilation fix

---
 radio/src/gui/9x/view_mavlink.cpp              |  2 +-
 radio/src/gui/9x/view_mavlink.h                |  2 +-
 radio/src/gui/taranis/gui.h                    |  4 ++--
 radio/src/targets/horus/board_horus.h          |  2 +-
 radio/src/targets/horus/lcd_driver.cpp         |  4 ++--
 radio/src/targets/simu/simpgmspace.cpp         |  4 ++--
 radio/src/targets/taranis/aspi.c               |  2 +-
 radio/src/targets/taranis/bluetooth_driver.cpp |  2 +-
 radio/src/targets/taranis/board_taranis.h      | 10 +++++-----
 radio/src/targets/taranis/delays.c             |  2 +-
 radio/src/targets/taranis/diskio.cpp           |  4 ++--
 radio/src/targets/taranis/i2c_driver.cpp       |  2 +-
 radio/src/targets/taranis/pwr_driver.c         |  2 +-
 radio/src/targets/taranis/top_lcd_driver.cpp   |  2 +-
 radio/src/targets/taranis/usb_bsp.c            |  4 ++--
 radio/src/targets/taranis/usb_driver.c         |  2 +-
 radio/src/targets/taranis/usbd_cdc.cpp         |  2 +-
 radio/src/targets/taranis/usbd_conf.h          |  2 +-
 radio/src/targets/taranis/usbd_desc.c          |  6 +++---
 radio/src/targets/taranis/usbd_hid_joystick.c  |  2 +-
 radio/src/targets/taranis/usbd_storage_msd.cpp |  4 ++--
 21 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/radio/src/gui/9x/view_mavlink.cpp b/radio/src/gui/9x/view_mavlink.cpp
index 65e192f8c..ba5a1aaaf 100644
--- a/radio/src/gui/9x/view_mavlink.cpp
+++ b/radio/src/gui/9x/view_mavlink.cpp
@@ -41,7 +41,7 @@
  *	Contains the menu specific code for Mavlink support.
  */
 
-#include "../9x/view_mavlink.h"
+#include "9x/view_mavlink.h"
 
 // Globals declaration
 
diff --git a/radio/src/gui/9x/view_mavlink.h b/radio/src/gui/9x/view_mavlink.h
index 152f94049..694c7fcc2 100644
--- a/radio/src/gui/9x/view_mavlink.h
+++ b/radio/src/gui/9x/view_mavlink.h
@@ -43,7 +43,7 @@
 #ifndef _VIEW_MAVLINK_H_
 #define _VIEW_MAVLINK_H_
 
-#include "../9x/menus.h"
+#include "menus.h"
 #include "opentx.h"
 #include "telemetry/mavlink.h"
 #include "targets/common_avr/serial_driver.h"
diff --git a/radio/src/gui/taranis/gui.h b/radio/src/gui/taranis/gui.h
index 7abbfbf1a..9df15c662 100644
--- a/radio/src/gui/taranis/gui.h
+++ b/radio/src/gui/taranis/gui.h
@@ -34,8 +34,8 @@
  *
  */
 
-#include "../taranis/lcd.h"
-#include "../taranis/menus.h"
+#include "lcd.h"
+#include "menus.h"
 
 #define DEFAULT_SCROLLBAR_X            (LCD_W-1)
 #define NUM_BODY_LINES                 (LCD_LINES-1)
diff --git a/radio/src/targets/horus/board_horus.h b/radio/src/targets/horus/board_horus.h
index 263612078..7e2c043fe 100644
--- a/radio/src/targets/horus/board_horus.h
+++ b/radio/src/targets/horus/board_horus.h
@@ -250,7 +250,7 @@ void lcdRefresh(void);
 void lcdDrawSolidFilledRectDMA(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color);
 void lcdDrawBitmapDMA(uint16_t x, uint16_t y, uint16_t w, uint16_t h, const uint8_t * bitmap);
 void lcdStoreBackupBuffer(void);
-bool lcdRestoreBackupBuffer(void);
+int lcdRestoreBackupBuffer(void);
 
 // Backlight driver
 #define setBacklight(xx)
diff --git a/radio/src/targets/horus/lcd_driver.cpp b/radio/src/targets/horus/lcd_driver.cpp
index ea1646a13..76a2dd309 100644
--- a/radio/src/targets/horus/lcd_driver.cpp
+++ b/radio/src/targets/horus/lcd_driver.cpp
@@ -519,11 +519,11 @@ void lcdStoreBackupBuffer()
   DMAcopy(src, dest, DISPLAY_BUFFER_SIZE);
 }
 
-bool lcdRestoreBackupBuffer()
+int lcdRestoreBackupBuffer()
 {
   uint16_t * dest = (uint16_t *)CurrentFrameBuffer, * src = (uint16_t *)LCD_BACKUP_FRAME_BUFFER;
   DMAcopy(src, dest, DISPLAY_BUFFER_SIZE);
-  return true;
+  return 1;
 }
 
 void lcdRefresh()
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index c01ef7524..e4653e59f 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -1284,10 +1284,10 @@ void lcdStoreBackupBuffer()
   memcpy(simuLcdBackupBuf, displayBuf, sizeof(simuLcdBackupBuf));
 }
 
-bool lcdRestoreBackupBuffer()
+int lcdRestoreBackupBuffer()
 {
   memcpy(displayBuf, simuLcdBackupBuf, sizeof(displayBuf));
-  return true;
+  return 1;
 }
 #endif
 
diff --git a/radio/src/targets/taranis/aspi.c b/radio/src/targets/taranis/aspi.c
index 56f41811c..ce435faa0 100644
--- a/radio/src/targets/taranis/aspi.c
+++ b/radio/src/targets/taranis/aspi.c
@@ -10,7 +10,7 @@
   ******************************************************************************
 */
 
-#include "../taranis/board_taranis.h"
+#include "board_taranis.h"
 
 /**
 **********send command to lcd**************
diff --git a/radio/src/targets/taranis/bluetooth_driver.cpp b/radio/src/targets/taranis/bluetooth_driver.cpp
index af25b005d..6a7a8dce6 100644
--- a/radio/src/targets/taranis/bluetooth_driver.cpp
+++ b/radio/src/targets/taranis/bluetooth_driver.cpp
@@ -10,7 +10,7 @@
 
 #include "string.h"
 #include "../../fifo.h"
-#include "../taranis/board_taranis.h"
+#include "board_taranis.h"
 
 Fifo<64> btTxFifo;
 Fifo<64> btRxFifo;
diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h
index 389e28cdc..4063701bf 100644
--- a/radio/src/targets/taranis/board_taranis.h
+++ b/radio/src/targets/taranis/board_taranis.h
@@ -78,13 +78,13 @@ extern "C" {
   #include "usbd_msc_core.h"
   #include "usbd_hid_core.h"
   #include "usbd_usr.h"
-  #include "../taranis/usbd_desc.h"
-  #include "../taranis/usb_conf.h"
-  #include "../taranis/usbd_conf.h"
+  #include "usbd_desc.h"
+  #include "usb_conf.h"
+  #include "usbd_conf.h"
 #endif
 
-#include "../taranis/hal.h"
-#include "../taranis/aspi.h"
+#include "hal.h"
+#include "aspi.h"
 
 #if defined(__cplusplus) && !defined(SIMU)
 }
diff --git a/radio/src/targets/taranis/delays.c b/radio/src/targets/taranis/delays.c
index 4851f0df5..756db1ed7 100644
--- a/radio/src/targets/taranis/delays.c
+++ b/radio/src/targets/taranis/delays.c
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../taranis/board_taranis.h"
+#include "board_taranis.h"
 
 void delaysInit(void)
 {
diff --git a/radio/src/targets/taranis/diskio.cpp b/radio/src/targets/taranis/diskio.cpp
index ea176b2dc..d57bd284e 100644
--- a/radio/src/targets/taranis/diskio.cpp
+++ b/radio/src/targets/taranis/diskio.cpp
@@ -39,8 +39,8 @@
 #include "../../thirdparty/FatFs/ff.h"
 #include "../../thirdparty/CoOS/kernel/CoOS.h"
 #include "../../debug.h"
-#include "../taranis/board_taranis.h"
-#include "../Taranis/hal.h"
+#include "board_taranis.h"
+#include "hal.h"
 
 /* Definitions for MMC/SDC command */
 #define CMD0    (0x40+0)        /* GO_IDLE_STATE */
diff --git a/radio/src/targets/taranis/i2c_driver.cpp b/radio/src/targets/taranis/i2c_driver.cpp
index 1e5c2130f..3655e3730 100644
--- a/radio/src/targets/taranis/i2c_driver.cpp
+++ b/radio/src/targets/taranis/i2c_driver.cpp
@@ -1,4 +1,4 @@
-#include "../taranis/board_taranis.h"
+#include "board_taranis.h"
 
 void eepromPageWrite(uint8_t* pBuffer, uint16_t WriteAddr, uint8_t NumByteToWrite);
 void eepromWaitEepromStandbyState(void);
diff --git a/radio/src/targets/taranis/pwr_driver.c b/radio/src/targets/taranis/pwr_driver.c
index ef68aff48..b5609af37 100644
--- a/radio/src/targets/taranis/pwr_driver.c
+++ b/radio/src/targets/taranis/pwr_driver.c
@@ -35,7 +35,7 @@
  */
 
 #include "../../pwr.h"
-#include "../taranis/board_taranis.h"
+#include "board_taranis.h"
 
 void pwrInit()
 {
diff --git a/radio/src/targets/taranis/top_lcd_driver.cpp b/radio/src/targets/taranis/top_lcd_driver.cpp
index cd83923e9..1741b899f 100644
--- a/radio/src/targets/taranis/top_lcd_driver.cpp
+++ b/radio/src/targets/taranis/top_lcd_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../taranis/board_taranis.h"
+#include "board_taranis.h"
 
 #define CS1_HIGH()     TOPLCD_GPIO->BSRRL = TOPLCD_GPIO_PIN_CS1
 #define CS1_LOW()      TOPLCD_GPIO->BSRRH = TOPLCD_GPIO_PIN_CS1
diff --git a/radio/src/targets/taranis/usb_bsp.c b/radio/src/targets/taranis/usb_bsp.c
index 98f9b1e12..8d29546c1 100644
--- a/radio/src/targets/taranis/usb_bsp.c
+++ b/radio/src/targets/taranis/usb_bsp.c
@@ -30,8 +30,8 @@
 
 #include "usb_bsp.h"
 
-#include "../taranis/board_taranis.h"
-#include "../taranis/usbd_conf.h"
+#include "board_taranis.h"
+#include "usbd_conf.h"
 
 extern uint32_t SystemCoreClock;
 
diff --git a/radio/src/targets/taranis/usb_driver.c b/radio/src/targets/taranis/usb_driver.c
index 71c84a64a..9233962b1 100644
--- a/radio/src/targets/taranis/usb_driver.c
+++ b/radio/src/targets/taranis/usb_driver.c
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../taranis/board_taranis.h"
+#include "board_taranis.h"
 #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
 
 int usbPlugged(void)
diff --git a/radio/src/targets/taranis/usbd_cdc.cpp b/radio/src/targets/taranis/usbd_cdc.cpp
index 2b6ea4e54..7b1a44634 100644
--- a/radio/src/targets/taranis/usbd_cdc.cpp
+++ b/radio/src/targets/taranis/usbd_cdc.cpp
@@ -34,7 +34,7 @@
 extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
-#include "../taranis/usb_conf.h"
+#include "usb_conf.h"
 
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
diff --git a/radio/src/targets/taranis/usbd_conf.h b/radio/src/targets/taranis/usbd_conf.h
index 0aa166a4d..557973a26 100644
--- a/radio/src/targets/taranis/usbd_conf.h
+++ b/radio/src/targets/taranis/usbd_conf.h
@@ -30,7 +30,7 @@
 #define __USBD_CONF__H__
 
 /* Includes ------------------------------------------------------------------*/
-#include "../taranis/usb_conf.h"
+#include "usb_conf.h"
 
 #define USBD_CFG_MAX_NUM           1
 #define USBD_ITF_MAX_NUM           1
diff --git a/radio/src/targets/taranis/usbd_desc.c b/radio/src/targets/taranis/usbd_desc.c
index e4de88d47..aba041d1f 100644
--- a/radio/src/targets/taranis/usbd_desc.c
+++ b/radio/src/targets/taranis/usbd_desc.c
@@ -26,12 +26,12 @@
   */ 
 
 /* Includes ------------------------------------------------------------------*/
-#include "../taranis/usbd_desc.h"
+#include "usbd_desc.h"
 
 #include <string.h>
 
-#include "../taranis/board_taranis.h"
-#include "../taranis/usbd_conf.h"
+#include "board_taranis.h"
+#include "usbd_conf.h"
 #include "usbd_core.h"
 #include "usbd_req.h"
 #include "usb_regs.h"
diff --git a/radio/src/targets/taranis/usbd_hid_joystick.c b/radio/src/targets/taranis/usbd_hid_joystick.c
index 0957c2f24..33e63a26f 100644
--- a/radio/src/targets/taranis/usbd_hid_joystick.c
+++ b/radio/src/targets/taranis/usbd_hid_joystick.c
@@ -47,7 +47,7 @@
   */ 
 
 /* Includes ------------------------------------------------------------------*/
-#include "../taranis/usbd_desc.h"
+#include "usbd_desc.h"
 #include "usbd_hid_core.h"
 #include "usbd_req.h"
 
diff --git a/radio/src/targets/taranis/usbd_storage_msd.cpp b/radio/src/targets/taranis/usbd_storage_msd.cpp
index 2be528596..51cccc788 100644
--- a/radio/src/targets/taranis/usbd_storage_msd.cpp
+++ b/radio/src/targets/taranis/usbd_storage_msd.cpp
@@ -28,14 +28,14 @@
 /* Includes ------------------------------------------------------------------*/
 #include "../../opentx.h"
 #include "../../thirdparty/FatFs/diskio.h"
-#include "../taranis/board_taranis.h"
+#include "board_taranis.h"
 
 #if defined(__cplusplus) && !defined(SIMU)
 extern "C" {
 #endif
 
 #include "usbd_msc_mem.h"
-#include "../taranis/usb_conf.h"
+#include "usb_conf.h"
 
 #if defined(BOOT)
 #define STORAGE_LUN_NBR    2