From 3291f21309bd8d5189e7d76a7775359595110212 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Wed, 13 Mar 2013 21:57:27 +0000
Subject: [PATCH] [X9D] Compilation error (includes)

---
 src/Makefile                                                    | 2 +-
 .../Libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h     | 2 +-
 .../Libraries/STM32_USB_OTG_Driver/inc/usb_core.h               | 2 +-
 .../Libraries/STM32_USB_OTG_Driver/inc/usb_defines.h            | 2 +-
 .../Libraries/STM32_USB_OTG_Driver/inc/usb_regs.h               | 2 +-
 src/x9d/board_x9d.cpp                                           | 2 +-
 src/x9d/usbd_desc.h                                             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index e6559c29f..3250b9236 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -506,7 +506,7 @@ ifeq ($(PCB), X9D)
   # X9D radio
   OPT = 2
   CPPDEFS += -DPCBX9D -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DPXX
-  EXTRAINCDIRS += CoOS/kernel CoOS/portable
+  EXTRAINCDIRS += x9d CoOS/kernel CoOS/portable
   EXTRAINCDIRS += x9d/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc x9d/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include
   EXTRAINCDIRS += x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc 
   EXTRAINCDIRS += x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/inc 
diff --git a/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h b/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h
index 6fd3230e9..184e8d4a7 100644
--- a/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h
+++ b/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h
@@ -30,7 +30,7 @@
 #define __USBD_CORE_H
 
 /* Includes ------------------------------------------------------------------*/
-#include "usb_dcd.h"
+#include "../../../STM32_USB_OTG_Driver/inc/usb_dcd.h"
 #include "usbd_def.h"
 #include "../../../../../usbd_conf.h"
 
diff --git a/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_core.h b/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_core.h
index 0a0690b8f..d44003b4f 100644
--- a/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_core.h
+++ b/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_core.h
@@ -30,7 +30,7 @@
 #define __USB_CORE_H__
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../usb_conf.h"
+#include "../../../../usb_conf.h"
 #include "usb_regs.h"
 #include "usb_defines.h"
 
diff --git a/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_defines.h b/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_defines.h
index 73b63bda3..6924276a6 100644
--- a/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_defines.h
+++ b/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_defines.h
@@ -30,7 +30,7 @@
 #define __USB_DEF_H__
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../usb_conf.h"
+#include "../../../../usb_conf.h"
 
 /** @addtogroup USB_OTG_DRIVER
   * @{
diff --git a/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_regs.h b/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_regs.h
index 898e55a1d..5bb42e1b7 100644
--- a/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_regs.h
+++ b/src/x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_regs.h
@@ -30,7 +30,7 @@
 #define __USB_OTG_REGS_H__
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../usb_conf.h"
+#include "../../../../usb_conf.h"
 
 
 /** @addtogroup USB_OTG_DRIVER
diff --git a/src/x9d/board_x9d.cpp b/src/x9d/board_x9d.cpp
index d3d5eeaa7..2e31e6954 100644
--- a/src/x9d/board_x9d.cpp
+++ b/src/x9d/board_x9d.cpp
@@ -36,7 +36,7 @@
 
 #include "../open9x.h"
 extern "C" {
-#include "x9d/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
+#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
 }
 
 // TODO needed?
diff --git a/src/x9d/usbd_desc.h b/src/x9d/usbd_desc.h
index e28e14ae0..a6dc86291 100644
--- a/src/x9d/usbd_desc.h
+++ b/src/x9d/usbd_desc.h
@@ -31,7 +31,7 @@
 #define __USB_DESC_H
 
 /* Includes ------------------------------------------------------------------*/
-#include "usbd_def.h"
+#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_def.h"
 
 /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
   * @{