From 92b617877ca990de5c3345b4b1997f782845a30d Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Fri, 9 Mar 2018 20:21:18 +0200 Subject: [PATCH] Move USB headers to usbdev to avoid including MP USB headers. --- src/bootloader/include/{ => usbdev}/usbd_cdc.h | 2 +- src/bootloader/include/{ => usbdev}/usbd_conf.h | 0 src/bootloader/include/{ => usbdev}/usbd_core.h | 8 ++++---- src/bootloader/include/{ => usbdev}/usbd_ctlreq.h | 2 +- src/bootloader/include/{ => usbdev}/usbd_def.h | 2 +- src/bootloader/include/{ => usbdev}/usbd_desc.h | 2 +- src/bootloader/include/{ => usbdev}/usbd_ioreq.h | 4 ++-- src/bootloader/src/main.c | 4 ++-- src/bootloader/src/usbd_cdc.c | 6 +++--- src/bootloader/src/usbd_cdc_interface.c | 2 +- src/bootloader/src/usbd_conf.c | 2 +- src/bootloader/src/usbd_core.c | 2 +- src/bootloader/src/usbd_ctlreq.c | 4 ++-- src/bootloader/src/usbd_desc.c | 6 +++--- src/bootloader/src/usbd_ioreq.c | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) rename src/bootloader/include/{ => usbdev}/usbd_cdc.h (99%) rename src/bootloader/include/{ => usbdev}/usbd_conf.h (100%) rename src/bootloader/include/{ => usbdev}/usbd_core.h (97%) rename src/bootloader/include/{ => usbdev}/usbd_ctlreq.h (98%) rename src/bootloader/include/{ => usbdev}/usbd_def.h (99%) rename src/bootloader/include/{ => usbdev}/usbd_desc.h (98%) rename src/bootloader/include/{ => usbdev}/usbd_ioreq.h (97%) diff --git a/src/bootloader/include/usbd_cdc.h b/src/bootloader/include/usbdev/usbd_cdc.h similarity index 99% rename from src/bootloader/include/usbd_cdc.h rename to src/bootloader/include/usbdev/usbd_cdc.h index 1c8e2976e..b8592db1e 100644 --- a/src/bootloader/include/usbd_cdc.h +++ b/src/bootloader/include/usbdev/usbd_cdc.h @@ -34,7 +34,7 @@ #endif /* Includes ------------------------------------------------------------------*/ -#include "usbd_ioreq.h" +#include "usbdev/usbd_ioreq.h" /** @addtogroup STM32_USB_DEVICE_LIBRARY * @{ diff --git a/src/bootloader/include/usbd_conf.h b/src/bootloader/include/usbdev/usbd_conf.h similarity index 100% rename from src/bootloader/include/usbd_conf.h rename to src/bootloader/include/usbdev/usbd_conf.h diff --git a/src/bootloader/include/usbd_core.h b/src/bootloader/include/usbdev/usbd_core.h similarity index 97% rename from src/bootloader/include/usbd_core.h rename to src/bootloader/include/usbdev/usbd_core.h index c78c7b363..0cb3ff50e 100644 --- a/src/bootloader/include/usbd_core.h +++ b/src/bootloader/include/usbdev/usbd_core.h @@ -30,10 +30,10 @@ #define __USBD_CORE_H /* Includes ------------------------------------------------------------------*/ -#include "usbd_conf.h" -#include "usbd_def.h" -#include "usbd_ioreq.h" -#include "usbd_ctlreq.h" +#include "usbdev/usbd_conf.h" +#include "usbdev/usbd_def.h" +#include "usbdev/usbd_ioreq.h" +#include "usbdev/usbd_ctlreq.h" /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY * @{ diff --git a/src/bootloader/include/usbd_ctlreq.h b/src/bootloader/include/usbdev/usbd_ctlreq.h similarity index 98% rename from src/bootloader/include/usbd_ctlreq.h rename to src/bootloader/include/usbdev/usbd_ctlreq.h index cd57fa828..605650f77 100644 --- a/src/bootloader/include/usbd_ctlreq.h +++ b/src/bootloader/include/usbdev/usbd_ctlreq.h @@ -31,7 +31,7 @@ #define __USB_REQUEST_H_ /* Includes ------------------------------------------------------------------*/ -#include "usbd_def.h" +#include "usbdev/usbd_def.h" /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY diff --git a/src/bootloader/include/usbd_def.h b/src/bootloader/include/usbdev/usbd_def.h similarity index 99% rename from src/bootloader/include/usbd_def.h rename to src/bootloader/include/usbdev/usbd_def.h index e29ad2b26..ec858b7ce 100644 --- a/src/bootloader/include/usbd_def.h +++ b/src/bootloader/include/usbdev/usbd_def.h @@ -31,7 +31,7 @@ #define __USBD_DEF_H /* Includes ------------------------------------------------------------------*/ -#include "usbd_conf.h" +#include "usbdev/usbd_conf.h" /** @addtogroup STM32_USBD_DEVICE_LIBRARY * @{ diff --git a/src/bootloader/include/usbd_desc.h b/src/bootloader/include/usbdev/usbd_desc.h similarity index 98% rename from src/bootloader/include/usbd_desc.h rename to src/bootloader/include/usbdev/usbd_desc.h index 385fcb2fc..287a062e1 100644 --- a/src/bootloader/include/usbd_desc.h +++ b/src/bootloader/include/usbdev/usbd_desc.h @@ -30,7 +30,7 @@ #define __USBD_DESC_H /* Includes ------------------------------------------------------------------*/ -#include "usbd_def.h" +#include "usbdev/usbd_def.h" /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ diff --git a/src/bootloader/include/usbd_ioreq.h b/src/bootloader/include/usbdev/usbd_ioreq.h similarity index 97% rename from src/bootloader/include/usbd_ioreq.h rename to src/bootloader/include/usbdev/usbd_ioreq.h index ab83bc086..fe9f80e4d 100644 --- a/src/bootloader/include/usbd_ioreq.h +++ b/src/bootloader/include/usbdev/usbd_ioreq.h @@ -31,8 +31,8 @@ #define __USBD_IOREQ_H_ /* Includes ------------------------------------------------------------------*/ -#include "usbd_def.h" -#include "usbd_core.h" +#include "usbdev/usbd_def.h" +#include "usbdev/usbd_core.h" /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY * @{ diff --git a/src/bootloader/src/main.c b/src/bootloader/src/main.c index a1d8b377a..ff9e93a92 100644 --- a/src/bootloader/src/main.c +++ b/src/bootloader/src/main.c @@ -1,6 +1,6 @@ #include STM32_HAL_H -#include "usbd_cdc.h" -#include "usbd_desc.h" +#include "usbdev/usbd_cdc.h" +#include "usbdev/usbd_desc.h" #include "omv_boardconfig.h" #define IDE_TIMEOUT (1000) diff --git a/src/bootloader/src/usbd_cdc.c b/src/bootloader/src/usbd_cdc.c index 05cb1afbd..3bfcb55b0 100644 --- a/src/bootloader/src/usbd_cdc.c +++ b/src/bootloader/src/usbd_cdc.c @@ -59,9 +59,9 @@ */ /* Includes ------------------------------------------------------------------*/ -#include "usbd_cdc.h" -#include "usbd_desc.h" -#include "usbd_ctlreq.h" +#include "usbdev/usbd_cdc.h" +#include "usbdev/usbd_desc.h" +#include "usbdev/usbd_ctlreq.h" #define CDC_IFACE_NUM (0) static USBD_CDC_HandleTypeDef CDC_ClassData; diff --git a/src/bootloader/src/usbd_cdc_interface.c b/src/bootloader/src/usbd_cdc_interface.c index afc0aea38..a272795eb 100644 --- a/src/bootloader/src/usbd_cdc_interface.c +++ b/src/bootloader/src/usbd_cdc_interface.c @@ -1,6 +1,6 @@ #include -#include #include "flash.h" +#include "usbdev/usbd_cdc.h" #include "omv_boardconfig.h" #define APP_RX_DATA_SIZE 2048 diff --git a/src/bootloader/src/usbd_conf.c b/src/bootloader/src/usbd_conf.c index bbc8b4401..cb5b4597a 100644 --- a/src/bootloader/src/usbd_conf.c +++ b/src/bootloader/src/usbd_conf.c @@ -27,7 +27,7 @@ /* Includes ------------------------------------------------------------------*/ #include STM32_HAL_H -#include "usbd_core.h" +#include "usbdev/usbd_core.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ diff --git a/src/bootloader/src/usbd_core.c b/src/bootloader/src/usbd_core.c index 66acf1ebd..4705e8ebd 100644 --- a/src/bootloader/src/usbd_core.c +++ b/src/bootloader/src/usbd_core.c @@ -26,7 +26,7 @@ */ /* Includes ------------------------------------------------------------------*/ -#include "usbd_core.h" +#include "usbdev/usbd_core.h" /** @addtogroup STM32_USBD_DEVICE_LIBRARY * @{ diff --git a/src/bootloader/src/usbd_ctlreq.c b/src/bootloader/src/usbd_ctlreq.c index d0bd68086..47b1c01b9 100644 --- a/src/bootloader/src/usbd_ctlreq.c +++ b/src/bootloader/src/usbd_ctlreq.c @@ -26,8 +26,8 @@ */ /* Includes ------------------------------------------------------------------*/ -#include "usbd_ctlreq.h" -#include "usbd_ioreq.h" +#include "usbdev/usbd_ctlreq.h" +#include "usbdev/usbd_ioreq.h" /** @addtogroup STM32_USBD_STATE_DEVICE_LIBRARY diff --git a/src/bootloader/src/usbd_desc.c b/src/bootloader/src/usbd_desc.c index 1e43842d2..7d3ebf5e7 100644 --- a/src/bootloader/src/usbd_desc.c +++ b/src/bootloader/src/usbd_desc.c @@ -26,9 +26,9 @@ */ /* Includes ------------------------------------------------------------------*/ -#include "usbd_core.h" -#include "usbd_desc.h" -#include "usbd_conf.h" +#include "usbdev/usbd_core.h" +#include "usbdev/usbd_desc.h" +#include "usbdev/usbd_conf.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ diff --git a/src/bootloader/src/usbd_ioreq.c b/src/bootloader/src/usbd_ioreq.c index 41d4cbcc9..168caf32b 100644 --- a/src/bootloader/src/usbd_ioreq.c +++ b/src/bootloader/src/usbd_ioreq.c @@ -26,7 +26,7 @@ */ /* Includes ------------------------------------------------------------------*/ -#include "usbd_ioreq.h" +#include "usbdev/usbd_ioreq.h" /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY * @{