From 2e458b565290add385289b11a6a9474ce6449dbd Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sat, 18 May 2013 20:53:28 +0200 Subject: [PATCH] OP-901 USB OTG/Device Drivers are not targeted for f103 (they are targeted at f105) so move again to F4 library folder instead of common --- .../Class/audio/inc/usbd_audio_core.h | 0 .../Class/audio/inc/usbd_audio_out_if.h | 0 .../Class/audio/src/usbd_audio_core.c | 0 .../Class/audio/src/usbd_audio_out_if.c | 0 .../STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_core.h | 0 .../Class/cdc/inc/usbd_cdc_if_template.h | 0 .../STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c | 0 .../Class/cdc/src/usbd_cdc_if_template.c | 0 .../STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_core.h | 0 .../STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h | 0 .../STM32_USB_Device_Library/Class/dfu/inc/usbd_flash_if.h | 0 .../Class/dfu/inc/usbd_mem_if_template.h | 0 .../STM32_USB_Device_Library/Class/dfu/inc/usbd_otp_if.h | 0 .../STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c | 0 .../STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_mal.c | 0 .../STM32_USB_Device_Library/Class/dfu/src/usbd_flash_if.c | 0 .../Class/dfu/src/usbd_mem_if_template.c | 0 .../STM32_USB_Device_Library/Class/dfu/src/usbd_otp_if.c | 0 .../STM32_USB_Device_Library/Class/hid/inc/usbd_hid_core.h | 0 .../STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c | 0 .../STM32_USB_Device_Library/Class/msc/inc/usbd_msc_bot.h | 0 .../STM32_USB_Device_Library/Class/msc/inc/usbd_msc_core.h | 0 .../STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h | 0 .../STM32_USB_Device_Library/Class/msc/inc/usbd_msc_mem.h | 0 .../STM32_USB_Device_Library/Class/msc/inc/usbd_msc_scsi.h | 0 .../STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c | 0 .../STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c | 0 .../STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c | 0 .../STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c | 0 .../Class/msc/src/usbd_storage_template.c | 0 .../STM32_USB_Device_Library/Core/inc/usbd_conf_template.h | 0 .../libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h | 0 .../libraries/STM32_USB_Device_Library/Core/inc/usbd_def.h | 0 .../libraries/STM32_USB_Device_Library/Core/inc/usbd_ioreq.h | 0 .../libraries/STM32_USB_Device_Library/Core/inc/usbd_req.h | 0 .../libraries/STM32_USB_Device_Library/Core/inc/usbd_usr.h | 0 .../libraries/STM32_USB_Device_Library/Core/src/usbd_core.c | 0 .../libraries/STM32_USB_Device_Library/Core/src/usbd_ioreq.c | 0 .../libraries/STM32_USB_Device_Library/Core/src/usbd_req.c | 0 .../libraries/STM32_USB_Device_Library/Release_Notes.html | 0 .../libraries/STM32_USB_OTG_Driver/Release_Notes.html | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_core.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_dcd.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_defines.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_hcd.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_hcd_int.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_otg.h | 0 .../libraries/STM32_USB_OTG_Driver/inc/usb_regs.h | 0 .../libraries/STM32_USB_OTG_Driver/src/usb_bsp_template.c | 0 .../libraries/STM32_USB_OTG_Driver/src/usb_core.c | 0 .../libraries/STM32_USB_OTG_Driver/src/usb_dcd.c | 0 .../libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c | 0 .../libraries/STM32_USB_OTG_Driver/src/usb_hcd.c | 0 .../libraries/STM32_USB_OTG_Driver/src/usb_hcd_int.c | 0 .../libraries/STM32_USB_OTG_Driver/src/usb_otg.c | 0 flight/pios/stm32f4xx/library.mk | 4 ++-- 59 files changed, 2 insertions(+), 2 deletions(-) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_out_if.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_core.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_out_if.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_core.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_if_template.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_core.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_flash_if.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_otp_if.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_mal.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_flash_if.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_mem_if_template.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_otp_if.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/hid/inc/usbd_hid_core.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_bot.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_core.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_mem.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_scsi.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_storage_template.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/inc/usbd_def.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/inc/usbd_ioreq.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/inc/usbd_req.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/inc/usbd_usr.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/src/usbd_core.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/src/usbd_ioreq.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Core/src/usbd_req.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_Device_Library/Release_Notes.html (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/Release_Notes.html (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_core.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_dcd.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_defines.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_hcd.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_hcd_int.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_otg.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/inc/usb_regs.h (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/src/usb_bsp_template.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/src/usb_core.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/src/usb_dcd.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/src/usb_hcd.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/src/usb_hcd_int.c (100%) rename flight/pios/{common => stm32f4xx}/libraries/STM32_USB_OTG_Driver/src/usb_otg.c (100%) diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_out_if.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_out_if.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_out_if.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_out_if.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_core.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_core.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_core.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_core.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_out_if.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_out_if.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_out_if.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/audio/src/usbd_audio_out_if.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_core.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_core.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_core.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_core.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_core.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_if_template.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_if_template.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_if_template.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/cdc/src/usbd_cdc_if_template.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_core.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_core.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_core.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_core.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_flash_if.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_flash_if.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_flash_if.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_flash_if.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_otp_if.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_otp_if.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_otp_if.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_otp_if.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_mal.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_mal.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_mal.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_mal.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_flash_if.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_flash_if.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_flash_if.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_flash_if.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_mem_if_template.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_mem_if_template.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_mem_if_template.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_mem_if_template.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_otp_if.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_otp_if.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_otp_if.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_otp_if.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/hid/inc/usbd_hid_core.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/hid/inc/usbd_hid_core.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/hid/inc/usbd_hid_core.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/hid/inc/usbd_hid_core.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_bot.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_bot.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_bot.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_bot.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_core.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_core.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_core.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_core.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_mem.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_mem.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_mem.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_mem.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_scsi.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_scsi.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_scsi.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_scsi.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_data.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_storage_template.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_storage_template.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_storage_template.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Class/msc/src/usbd_storage_template.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_core.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_def.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_def.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_def.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_def.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_ioreq.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_ioreq.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_ioreq.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_ioreq.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_req.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_req.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_req.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_req.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_usr.h b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_usr.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/inc/usbd_usr.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/inc/usbd_usr.h diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/src/usbd_core.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/src/usbd_core.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/src/usbd_core.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/src/usbd_core.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/src/usbd_ioreq.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/src/usbd_ioreq.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/src/usbd_ioreq.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/src/usbd_ioreq.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Core/src/usbd_req.c b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/src/usbd_req.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Core/src/usbd_req.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Core/src/usbd_req.c diff --git a/flight/pios/common/libraries/STM32_USB_Device_Library/Release_Notes.html b/flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Release_Notes.html similarity index 100% rename from flight/pios/common/libraries/STM32_USB_Device_Library/Release_Notes.html rename to flight/pios/stm32f4xx/libraries/STM32_USB_Device_Library/Release_Notes.html diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/Release_Notes.html b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/Release_Notes.html similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/Release_Notes.html rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/Release_Notes.html diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_core.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_core.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_core.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_core.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_dcd.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_dcd.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_dcd.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_dcd.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_defines.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_defines.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_defines.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_defines.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_hcd.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_hcd.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_hcd.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_hcd.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_hcd_int.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_hcd_int.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_hcd_int.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_hcd_int.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_otg.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_otg.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_otg.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_otg.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_regs.h b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_regs.h similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/inc/usb_regs.h rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/inc/usb_regs.h diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_bsp_template.c b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_bsp_template.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_bsp_template.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_bsp_template.c diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_core.c b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_core.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_core.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_core.c diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_dcd.c b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_dcd.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_dcd.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_dcd.c diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_dcd_int.c diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_hcd.c b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_hcd.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_hcd.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_hcd.c diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_hcd_int.c b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_hcd_int.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_hcd_int.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_hcd_int.c diff --git a/flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_otg.c b/flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_otg.c similarity index 100% rename from flight/pios/common/libraries/STM32_USB_OTG_Driver/src/usb_otg.c rename to flight/pios/stm32f4xx/libraries/STM32_USB_OTG_Driver/src/usb_otg.c diff --git a/flight/pios/stm32f4xx/library.mk b/flight/pios/stm32f4xx/library.mk index 60a11e875..a8065f237 100644 --- a/flight/pios/stm32f4xx/library.mk +++ b/flight/pios/stm32f4xx/library.mk @@ -38,13 +38,13 @@ SRC += $(sort $(wildcard $(PERIPHLIB)/src/*.c)) EXTRAINCDIRS += $(PERIPHLIB)/inc # ST USB OTG library -USBOTGLIB = $(PIOSCOMMON)/libraries/STM32_USB_OTG_Driver +USBOTGLIB = $(PIOS_DEVLIB)/libraries/STM32_USB_OTG_Driver USBOTGLIB_SRC = usb_core.c usb_dcd.c usb_dcd_int.c SRC += $(addprefix $(USBOTGLIB)/src/,$(USBOTGLIB_SRC)) EXTRAINCDIRS += $(USBOTGLIB)/inc # ST USB Device library -USBDEVLIB = $(PIOSCOMMON)/libraries/STM32_USB_Device_Library +USBDEVLIB = $(PIOS_DEVLIB)/libraries/STM32_USB_Device_Library SRC += $(sort $(wildcard $(USBDEVLIB)/Core/src/*.c)) EXTRAINCDIRS += $(USBDEVLIB)/Core/inc