From 29e7e5ad4d670153ab984b056a84ad864fab263f Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Thu, 5 Nov 2020 13:32:09 +0100 Subject: [PATCH] STM32F3: directory restructuration --- .../CMSIS}/stm32f302x8.h | 0 .../CMSIS}/stm32f303x8.h | 0 .../CMSIS}/stm32f303xc.h | 0 .../CMSIS}/stm32f303xe.h | 0 .../CMSIS}/stm32f334x8.h | 0 .../device => STM32Cube_FW/CMSIS}/stm32f3xx.h | 0 .../CMSIS}/system_stm32f3xx.h | 0 .../Legacy}/stm32_hal_legacy.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_adc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_adc.h | 0 .../stm32f3xx_hal_adc_ex.c | 0 .../stm32f3xx_hal_adc_ex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_can.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_can.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_cec.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_cec.h | 0 .../stm32f3xx_hal_comp.c | 0 .../stm32f3xx_hal_comp.h | 0 .../stm32f3xx_hal_comp_ex.h | 0 .../stm32f3xx_hal_cortex.c | 0 .../stm32f3xx_hal_cortex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_crc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_crc.h | 0 .../stm32f3xx_hal_crc_ex.c | 0 .../stm32f3xx_hal_crc_ex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_dac.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_dac.h | 0 .../stm32f3xx_hal_dac_ex.c | 0 .../stm32f3xx_hal_dac_ex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_def.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_dma.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_dma.h | 0 .../stm32f3xx_hal_dma_ex.h | 0 .../stm32f3xx_hal_flash.c | 0 .../stm32f3xx_hal_flash.h | 0 .../stm32f3xx_hal_flash_ex.c | 0 .../stm32f3xx_hal_flash_ex.h | 0 .../stm32f3xx_hal_gpio.c | 0 .../stm32f3xx_hal_gpio.h | 0 .../stm32f3xx_hal_gpio_ex.h | 0 .../stm32f3xx_hal_hrtim.c | 0 .../stm32f3xx_hal_hrtim.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2c.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2c.h | 0 .../stm32f3xx_hal_i2c_ex.c | 0 .../stm32f3xx_hal_i2c_ex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2s.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2s.h | 0 .../stm32f3xx_hal_i2s_ex.c | 0 .../stm32f3xx_hal_i2s_ex.h | 0 .../stm32f3xx_hal_irda.c | 0 .../stm32f3xx_hal_irda.h | 0 .../stm32f3xx_hal_irda_ex.h | 0 .../stm32f3xx_hal_iwdg.c | 0 .../stm32f3xx_hal_iwdg.h | 0 .../stm32f3xx_hal_nand.c | 0 .../stm32f3xx_hal_nand.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_nor.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_nor.h | 0 .../stm32f3xx_hal_opamp.c | 0 .../stm32f3xx_hal_opamp.h | 0 .../stm32f3xx_hal_opamp_ex.c | 0 .../stm32f3xx_hal_opamp_ex.h | 0 .../stm32f3xx_hal_pccard.c | 0 .../stm32f3xx_hal_pccard.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_pcd.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_pcd.h | 0 .../stm32f3xx_hal_pcd_ex.c | 0 .../stm32f3xx_hal_pcd_ex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_pwr.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_pwr.h | 0 .../stm32f3xx_hal_pwr_ex.c | 0 .../stm32f3xx_hal_pwr_ex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_rcc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_rcc.h | 0 .../stm32f3xx_hal_rcc_ex.c | 0 .../stm32f3xx_hal_rcc_ex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_rtc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_rtc.h | 0 .../stm32f3xx_hal_rtc_ex.c | 0 .../stm32f3xx_hal_rtc_ex.h | 0 .../stm32f3xx_hal_sdadc.c | 0 .../stm32f3xx_hal_sdadc.h | 0 .../stm32f3xx_hal_smartcard.c | 0 .../stm32f3xx_hal_smartcard.h | 0 .../stm32f3xx_hal_smartcard_ex.c | 0 .../stm32f3xx_hal_smartcard_ex.h | 0 .../stm32f3xx_hal_smbus.c | 0 .../stm32f3xx_hal_smbus.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_spi.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_spi.h | 0 .../stm32f3xx_hal_spi_ex.c | 0 .../stm32f3xx_hal_spi_ex.h | 0 .../stm32f3xx_hal_sram.c | 0 .../stm32f3xx_hal_sram.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_tim.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_tim.h | 0 .../stm32f3xx_hal_tim_ex.c | 0 .../stm32f3xx_hal_tim_ex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_tsc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_hal_tsc.h | 0 .../stm32f3xx_hal_uart.c | 0 .../stm32f3xx_hal_uart.h | 0 .../stm32f3xx_hal_uart_ex.c | 0 .../stm32f3xx_hal_uart_ex.h | 0 .../stm32f3xx_hal_usart.c | 0 .../stm32f3xx_hal_usart.h | 0 .../stm32f3xx_hal_usart_ex.h | 0 .../stm32f3xx_hal_wwdg.c | 0 .../stm32f3xx_hal_wwdg.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_adc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_adc.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_bus.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_comp.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_comp.h | 0 .../stm32f3xx_ll_cortex.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_crc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_crc.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_dac.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_dac.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_dma.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_dma.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_exti.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_exti.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_fmc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_fmc.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_gpio.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_gpio.h | 0 .../stm32f3xx_ll_hrtim.c | 0 .../stm32f3xx_ll_hrtim.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_i2c.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_i2c.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_iwdg.h | 0 .../stm32f3xx_ll_opamp.c | 0 .../stm32f3xx_ll_opamp.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_pwr.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_pwr.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_rcc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_rcc.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_rtc.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_rtc.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_spi.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_spi.h | 0 .../stm32f3xx_ll_system.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_tim.c | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_tim.h | 0 .../stm32f3xx_ll_usart.c | 0 .../stm32f3xx_ll_usart.h | 0 .../stm32f3xx_ll_utils.c | 0 .../stm32f3xx_ll_utils.h | 0 .../STM32F3xx_HAL_Driver}/stm32f3xx_ll_wwdg.h | 0 .../stm32f3xx_hal_conf.h | 0 .../system_stm32f3xx.c | 0 .../TOOLCHAIN_ARM/startup_stm32f302x8.S | 0 .../TOOLCHAIN_ARM/stm32f302x8.sct | 0 .../TOOLCHAIN_GCC_ARM/STM32F302X8.ld | 0 .../TOOLCHAIN_GCC_ARM/startup_stm32f302x8.S | 0 .../TOOLCHAIN_IAR/startup_stm32f302x8.S | 0 .../TOOLCHAIN_IAR/stm32f302x8.icf | 0 .../{device => }/cmsis_nvic.h | 0 .../TARGET_STM32F302x8/device/stm32f3xx.h | 250 ------------------ .../{device => }/us_ticker_data.h | 0 .../TOOLCHAIN_ARM/startup_stm32f303x8.S | 0 .../TOOLCHAIN_ARM/stm32f303x8.sct | 0 .../TOOLCHAIN_GCC_ARM/STM32F303X8.ld | 0 .../TOOLCHAIN_GCC_ARM/startup_stm32f303x8.S | 0 .../TOOLCHAIN_IAR/startup_stm32f303x8.S | 0 .../TOOLCHAIN_IAR/stm32f303x8.icf | 0 .../{device => }/cmsis_nvic.h | 0 .../TARGET_STM32F303x8/device/stm32f3xx.h | 250 ------------------ .../device/system_stm32f3xx.h | 124 --------- .../{device => }/us_ticker_data.h | 0 .../TOOLCHAIN_ARM/startup_stm32f303xc.S | 0 .../TOOLCHAIN_ARM/stm32f303xc.sct | 0 .../TOOLCHAIN_GCC_ARM/STM32F303XC.ld | 0 .../TOOLCHAIN_GCC_ARM/startup_stm32f303xc.S | 0 .../TOOLCHAIN_IAR/startup_stm32f303xc.S | 0 .../TOOLCHAIN_IAR/stm32f303xc.icf | 0 .../{device => }/cmsis_nvic.h | 0 .../TARGET_STM32F303xC/device/stm32f3xx.h | 250 ------------------ .../device/system_stm32f3xx.h | 124 --------- .../{device => }/us_ticker_data.h | 0 .../TOOLCHAIN_ARM/startup_stm32f303xe.S | 0 .../TOOLCHAIN_ARM/stm32f303xe.sct | 0 .../TOOLCHAIN_GCC_ARM/STM32F303XE.ld | 0 .../TOOLCHAIN_GCC_ARM/startup_stm32f303xe.S | 0 .../TOOLCHAIN_IAR/startup_stm32f303xe.S | 0 .../TOOLCHAIN_IAR/stm32f303xe.icf | 0 .../{device => }/cmsis_nvic.h | 0 .../TARGET_STM32F303xE/device/stm32f3xx.h | 250 ------------------ .../device/system_stm32f3xx.h | 124 --------- .../{device => }/us_ticker_data.h | 0 .../TOOLCHAIN_ARM/startup_stm32f334x8.S | 0 .../TOOLCHAIN_ARM/stm32f334x8.sct | 0 .../TOOLCHAIN_GCC_ARM/STM32F334X8.ld | 0 .../TOOLCHAIN_GCC_ARM/startup_stm32f334x8.S | 0 .../TOOLCHAIN_IAR/startup_stm32f334x8.S | 0 .../TOOLCHAIN_IAR/stm32f334x8.icf | 0 .../{device => }/cmsis_nvic.h | 0 .../device/system_stm32f3xx.h | 124 --------- .../{device => }/us_ticker_data.h | 0 203 files changed, 1496 deletions(-) rename targets/TARGET_STM/TARGET_STM32F3/{TARGET_STM32F302x8/device => STM32Cube_FW/CMSIS}/stm32f302x8.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{TARGET_STM32F303x8/device => STM32Cube_FW/CMSIS}/stm32f303x8.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{TARGET_STM32F303xC/device => STM32Cube_FW/CMSIS}/stm32f303xc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{TARGET_STM32F303xE/device => STM32Cube_FW/CMSIS}/stm32f303xe.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{TARGET_STM32F334x8/device => STM32Cube_FW/CMSIS}/stm32f334x8.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{TARGET_STM32F334x8/device => STM32Cube_FW/CMSIS}/stm32f3xx.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{TARGET_STM32F302x8/device => STM32Cube_FW/CMSIS}/system_stm32f3xx.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver/Legacy}/stm32_hal_legacy.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_adc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_adc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_adc_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_adc_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_can.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_can.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_cec.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_cec.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_comp.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_comp.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_comp_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_cortex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_cortex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_crc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_crc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_crc_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_crc_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_dac.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_dac.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_dac_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_dac_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_def.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_dma.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_dma.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_dma_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_flash.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_flash.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_flash_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_flash_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_gpio.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_gpio.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_gpio_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_hrtim.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_hrtim.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2c.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2c.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2c_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2c_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2s.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2s.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2s_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_i2s_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_irda.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_irda.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_irda_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_iwdg.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_iwdg.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_nand.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_nand.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_nor.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_nor.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_opamp.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_opamp.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_opamp_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_opamp_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pccard.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pccard.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pcd.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pcd.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pcd_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pcd_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pwr.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pwr.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pwr_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_pwr_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_rcc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_rcc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_rcc_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_rcc_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_rtc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_rtc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_rtc_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_rtc_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_sdadc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_sdadc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_smartcard.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_smartcard.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_smartcard_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_smartcard_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_smbus.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_smbus.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_spi.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_spi.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_spi_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_spi_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_sram.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_sram.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_tim.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_tim.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_tim_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_tim_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_tsc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_tsc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_uart.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_uart.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_uart_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_uart_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_usart.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_usart.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_usart_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_wwdg.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_hal_wwdg.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_adc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_adc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_bus.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_comp.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_comp.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_cortex.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_crc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_crc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_dac.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_dac.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_dma.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_dma.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_exti.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_exti.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_fmc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_fmc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_gpio.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_gpio.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_hrtim.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_hrtim.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_i2c.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_i2c.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_iwdg.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_opamp.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_opamp.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_pwr.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_pwr.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_rcc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_rcc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_rtc.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_rtc.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_spi.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_spi.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_system.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_tim.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_tim.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_usart.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_usart.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_utils.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_utils.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW/STM32F3xx_HAL_Driver}/stm32f3xx_ll_wwdg.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW}/stm32f3xx_hal_conf.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/{device => STM32Cube_FW}/system_stm32f3xx.c (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/{device => }/TOOLCHAIN_ARM/startup_stm32f302x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/{device => }/TOOLCHAIN_ARM/stm32f302x8.sct (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/{device => }/TOOLCHAIN_GCC_ARM/STM32F302X8.ld (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/{device => }/TOOLCHAIN_GCC_ARM/startup_stm32f302x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/{device => }/TOOLCHAIN_IAR/startup_stm32f302x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/{device => }/TOOLCHAIN_IAR/stm32f302x8.icf (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/{device => }/cmsis_nvic.h (100%) delete mode 100644 targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/stm32f3xx.h rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/{device => }/us_ticker_data.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/{device => }/TOOLCHAIN_ARM/startup_stm32f303x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/{device => }/TOOLCHAIN_ARM/stm32f303x8.sct (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/{device => }/TOOLCHAIN_GCC_ARM/STM32F303X8.ld (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/{device => }/TOOLCHAIN_GCC_ARM/startup_stm32f303x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/{device => }/TOOLCHAIN_IAR/startup_stm32f303x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/{device => }/TOOLCHAIN_IAR/stm32f303x8.icf (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/{device => }/cmsis_nvic.h (100%) delete mode 100644 targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/stm32f3xx.h delete mode 100644 targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/system_stm32f3xx.h rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/{device => }/us_ticker_data.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/{device => }/TOOLCHAIN_ARM/startup_stm32f303xc.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/{device => }/TOOLCHAIN_ARM/stm32f303xc.sct (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/{device => }/TOOLCHAIN_GCC_ARM/STM32F303XC.ld (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/{device => }/TOOLCHAIN_GCC_ARM/startup_stm32f303xc.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/{device => }/TOOLCHAIN_IAR/startup_stm32f303xc.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/{device => }/TOOLCHAIN_IAR/stm32f303xc.icf (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/{device => }/cmsis_nvic.h (100%) delete mode 100644 targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/stm32f3xx.h delete mode 100644 targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/system_stm32f3xx.h rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/{device => }/us_ticker_data.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/{device => }/TOOLCHAIN_ARM/startup_stm32f303xe.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/{device => }/TOOLCHAIN_ARM/stm32f303xe.sct (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/{device => }/TOOLCHAIN_GCC_ARM/STM32F303XE.ld (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/{device => }/TOOLCHAIN_GCC_ARM/startup_stm32f303xe.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/{device => }/TOOLCHAIN_IAR/startup_stm32f303xe.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/{device => }/TOOLCHAIN_IAR/stm32f303xe.icf (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/{device => }/cmsis_nvic.h (100%) delete mode 100644 targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/stm32f3xx.h delete mode 100644 targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/system_stm32f3xx.h rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/{device => }/us_ticker_data.h (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/{device => }/TOOLCHAIN_ARM/startup_stm32f334x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/{device => }/TOOLCHAIN_ARM/stm32f334x8.sct (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/{device => }/TOOLCHAIN_GCC_ARM/STM32F334X8.ld (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/{device => }/TOOLCHAIN_GCC_ARM/startup_stm32f334x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/{device => }/TOOLCHAIN_IAR/startup_stm32f334x8.S (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/{device => }/TOOLCHAIN_IAR/stm32f334x8.icf (100%) rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/{device => }/cmsis_nvic.h (100%) delete mode 100644 targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/system_stm32f3xx.h rename targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/{device => }/us_ticker_data.h (100%) diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/stm32f302x8.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f302x8.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/stm32f302x8.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f302x8.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/stm32f303x8.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303x8.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/stm32f303x8.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303x8.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/stm32f303xc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303xc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/stm32f303xc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303xc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/stm32f303xe.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303xe.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/stm32f303xe.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303xe.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/stm32f334x8.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f334x8.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/stm32f334x8.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f334x8.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f3xx.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/stm32f3xx.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f3xx.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/system_stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/system_stm32f3xx.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/system_stm32f3xx.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/system_stm32f3xx.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32_hal_legacy.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/Legacy/stm32_hal_legacy.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32_hal_legacy.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/Legacy/stm32_hal_legacy.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_adc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_adc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_adc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_adc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_adc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_adc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_adc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_adc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_adc_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_adc_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_adc_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_adc_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_adc_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_adc_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_adc_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_adc_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_can.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_can.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_can.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_can.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_can.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_can.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_can.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_can.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_cec.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_cec.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_cec.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_cec.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_cec.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_cec.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_cec.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_cec.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_comp.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_comp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_comp.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_comp.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_comp.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_comp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_comp.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_comp.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_comp_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_comp_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_comp_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_comp_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_cortex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_cortex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_cortex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_cortex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_cortex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_cortex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_cortex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_cortex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_crc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_crc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_crc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_crc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_crc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_crc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_crc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_crc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_crc_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_crc_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_crc_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_crc_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_crc_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_crc_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_crc_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_crc_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dac.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dac.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dac.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dac.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dac.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dac.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dac.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dac.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dac_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dac_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dac_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dac_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dac_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dac_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dac_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dac_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_def.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_def.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_def.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dma.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dma.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dma.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dma.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dma.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dma.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dma.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dma.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dma_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dma_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_dma_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_dma_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_flash.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_flash.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_flash.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_flash.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_flash.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_flash.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_flash.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_flash.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_flash_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_flash_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_flash_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_flash_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_flash_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_flash_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_flash_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_flash_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_gpio.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_gpio.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_gpio.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_gpio.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_gpio.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_gpio.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_gpio.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_gpio.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_gpio_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_gpio_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_gpio_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_gpio_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_hrtim.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_hrtim.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_hrtim.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_hrtim.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_hrtim.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_hrtim.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_hrtim.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_hrtim.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2c.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2c.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2c.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2c.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2c_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2c_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2c_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2c_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2s.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2s.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2s.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2s.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2s.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2s.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2s.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2s.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2s_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2s_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2s_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2s_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2s_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2s_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2s_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_i2s_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_irda.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_irda.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_irda.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_irda.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_irda.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_irda.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_irda.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_irda.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_irda_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_irda_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_irda_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_irda_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_iwdg.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_iwdg.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_iwdg.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_iwdg.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_iwdg.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_iwdg.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_iwdg.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_iwdg.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_nand.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_nand.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_nand.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_nand.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_nand.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_nand.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_nand.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_nand.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_nor.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_nor.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_nor.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_nor.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_nor.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_nor.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_nor.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_nor.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_opamp.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_opamp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_opamp.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_opamp.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_opamp.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_opamp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_opamp.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_opamp.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_opamp_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_opamp_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_opamp_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_opamp_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_opamp_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_opamp_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_opamp_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_opamp_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pccard.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pccard.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pccard.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pccard.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pccard.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pccard.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pccard.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pccard.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pcd.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pcd.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pcd.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pcd.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pcd.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pcd.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pcd.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pcd.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pcd_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pcd_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pcd_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pcd_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pcd_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pcd_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pcd_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pcd_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pwr.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pwr.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pwr.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pwr.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pwr.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pwr.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pwr.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pwr.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pwr_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pwr_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pwr_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pwr_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pwr_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pwr_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_pwr_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_pwr_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rcc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rcc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rcc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rcc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rcc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rcc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rcc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rcc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rcc_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rcc_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rcc_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rcc_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rcc_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rcc_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rcc_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rcc_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rtc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rtc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rtc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rtc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rtc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rtc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rtc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rtc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rtc_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rtc_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rtc_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rtc_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rtc_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rtc_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_rtc_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_rtc_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_sdadc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_sdadc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_sdadc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_sdadc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_sdadc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_sdadc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_sdadc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_sdadc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smartcard.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smartcard.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smartcard.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smartcard.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smartcard.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smartcard.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smartcard.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smartcard.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smartcard_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smartcard_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smartcard_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smartcard_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smartcard_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smartcard_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smartcard_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smartcard_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smbus.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smbus.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smbus.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smbus.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smbus.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smbus.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_smbus.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_smbus.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_spi.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_spi.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_spi.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_spi.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_spi.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_spi.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_spi.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_spi.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_spi_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_spi_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_spi_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_spi_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_spi_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_spi_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_spi_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_spi_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_sram.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_sram.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_sram.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_sram.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_sram.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_sram.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_sram.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_sram.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tim.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tim.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tim.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tim.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tim.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tim.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tim.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tim.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tim_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tim_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tim_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tim_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tim_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tim_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tim_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tim_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tsc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tsc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tsc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tsc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tsc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tsc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_tsc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_tsc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_uart.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_uart.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_uart.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_uart.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_uart.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_uart.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_uart.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_uart.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_uart_ex.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_uart_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_uart_ex.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_uart_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_uart_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_uart_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_uart_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_uart_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_usart.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_usart.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_usart.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_usart.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_usart.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_usart.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_usart.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_usart.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_usart_ex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_usart_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_usart_ex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_usart_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_wwdg.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_wwdg.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_wwdg.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_wwdg.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_wwdg.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_wwdg.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_wwdg.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_hal_wwdg.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_adc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_adc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_adc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_adc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_adc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_adc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_adc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_adc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_bus.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_bus.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_bus.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_bus.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_comp.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_comp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_comp.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_comp.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_comp.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_comp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_comp.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_comp.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_cortex.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_cortex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_cortex.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_cortex.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_crc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_crc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_crc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_crc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_crc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_crc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_crc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_crc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_dac.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_dac.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_dac.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_dac.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_dac.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_dac.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_dac.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_dac.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_dma.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_dma.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_dma.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_dma.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_dma.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_dma.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_dma.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_dma.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_exti.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_exti.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_exti.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_exti.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_exti.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_exti.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_exti.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_exti.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_fmc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_fmc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_fmc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_fmc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_fmc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_fmc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_fmc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_fmc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_gpio.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_gpio.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_gpio.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_gpio.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_gpio.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_gpio.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_gpio.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_gpio.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_hrtim.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_hrtim.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_hrtim.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_hrtim.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_hrtim.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_hrtim.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_hrtim.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_hrtim.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_i2c.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_i2c.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_i2c.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_i2c.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_i2c.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_i2c.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_i2c.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_i2c.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_iwdg.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_iwdg.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_iwdg.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_iwdg.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_opamp.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_opamp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_opamp.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_opamp.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_opamp.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_opamp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_opamp.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_opamp.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_pwr.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_pwr.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_pwr.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_pwr.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_pwr.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_pwr.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_pwr.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_pwr.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_rcc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_rcc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_rcc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_rcc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_rcc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_rcc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_rcc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_rcc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_rtc.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_rtc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_rtc.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_rtc.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_rtc.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_rtc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_rtc.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_rtc.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_spi.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_spi.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_spi.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_spi.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_spi.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_spi.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_spi.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_spi.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_system.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_system.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_system.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_system.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_tim.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_tim.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_tim.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_tim.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_tim.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_tim.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_tim.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_tim.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_usart.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_usart.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_usart.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_usart.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_usart.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_usart.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_usart.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_usart.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_utils.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_utils.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_utils.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_utils.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_utils.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_utils.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_utils.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_utils.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_wwdg.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_wwdg.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_ll_wwdg.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/STM32F3xx_HAL_Driver/stm32f3xx_ll_wwdg.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/stm32f3xx_hal_conf.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_conf.h rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/stm32f3xx_hal_conf.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/system_stm32f3xx.c b/targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/system_stm32f3xx.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/device/system_stm32f3xx.c rename to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/system_stm32f3xx.c diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_ARM/startup_stm32f302x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_ARM/startup_stm32f302x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_ARM/startup_stm32f302x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_ARM/startup_stm32f302x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_ARM/stm32f302x8.sct b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_ARM/stm32f302x8.sct similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_ARM/stm32f302x8.sct rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_ARM/stm32f302x8.sct diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_GCC_ARM/STM32F302X8.ld b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_GCC_ARM/STM32F302X8.ld similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_GCC_ARM/STM32F302X8.ld rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_GCC_ARM/STM32F302X8.ld diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_GCC_ARM/startup_stm32f302x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_GCC_ARM/startup_stm32f302x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_GCC_ARM/startup_stm32f302x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_GCC_ARM/startup_stm32f302x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_IAR/startup_stm32f302x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_IAR/startup_stm32f302x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_IAR/startup_stm32f302x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_IAR/startup_stm32f302x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_IAR/stm32f302x8.icf b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_IAR/stm32f302x8.icf similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/TOOLCHAIN_IAR/stm32f302x8.icf rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TOOLCHAIN_IAR/stm32f302x8.icf diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/cmsis_nvic.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/cmsis_nvic.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/cmsis_nvic.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/stm32f3xx.h deleted file mode 100644 index 5a17536dc8..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/stm32f3xx.h +++ /dev/null @@ -1,250 +0,0 @@ -/** - ****************************************************************************** - * @file stm32f3xx.h - * @author MCD Application Team - * @brief CMSIS STM32F3xx Device Peripheral Access Layer Header File. - * - * The file is the unique include file that the application programmer - * is using in the C source code, usually in main.c. This file contains: - * - Configuration section that allows to select: - * - The STM32F3xx device used in the target application - * - To use or not the peripheral’s drivers in application code(i.e. - * code will be based on direct access to peripheral’s registers - * rather than drivers API), this option is controlled by - * "#define USE_HAL_DRIVER" - * - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2016 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f3xx - * @{ - */ - -#ifndef __STM32F3xx_H -#define __STM32F3xx_H - -#ifdef __cplusplus - extern "C" { -#endif /* __cplusplus */ - -/** @addtogroup Library_configuration_section - * @{ - */ - -/** - * @brief STM32 Family - */ -#if !defined (STM32F3) -#define STM32F3 -#endif /* STM32F3 */ - -/* Uncomment the line below according to the target STM32 device used in your - application - */ - -#if !defined (STM32F301x8) && !defined (STM32F302x8) && !defined (STM32F318xx) && \ - !defined (STM32F302xC) && !defined (STM32F303xC) && !defined (STM32F358xx) && \ - !defined (STM32F303x8) && !defined (STM32F334x8) && !defined (STM32F328xx) && \ - !defined (STM32F302xE) && !defined (STM32F303xE) && !defined (STM32F398xx) && \ - !defined (STM32F373xC) && !defined (STM32F378xx) - - /* #define STM32F301x8 */ /*!< STM32F301K6, STM32F301K8, STM32F301C6, STM32F301C8, - STM32F301R6 and STM32F301R8 Devices */ -#define STM32F302x8 /*!< STM32F302K6, STM32F302K8, STM32F302C6, STM32F302C8, - STM32F302R6 and STM32F302R8 Devices */ - /* #define STM32F302xC */ /*!< STM32F302CB, STM32F302CC, STM32F302RB, STM32F302RC, - STM32F302VB and STM32F302VC Devices */ - /* #define STM32F302xE */ /*!< STM32F302RE, STM32F302VE, STM32F302ZE, STM32F302RD, - STM32F302VD and STM32F302ZD Devices */ - /* #define STM32F303x8 */ /*!< STM32F303K6, STM32F303K8, STM32F303C6, STM32F303C8, - STM32F303R6 and STM32F303R8 Devices */ - /* #define STM32F303xC */ /*!< STM32F303CB, STM32F303CC, STM32F303RB, STM32F303RC, - STM32F303VB and STM32F303VC Devices */ - /* #define STM32F303xE */ /*!< STM32F303RE, STM32F303VE, STM32F303ZE, STM32F303RD, - STM32F303VD and STM32F303ZD Devices */ - /* #define STM32F373xC */ /*!< STM32F373C8, STM32F373CB, STM32F373CC, - STM32F373R8, STM32F373RB, STM32F373RC, - STM32F373V8, STM32F373VB and STM32F373VC Devices */ - /* #define STM32F334x8 */ /*!< STM32F334K4, STM32F334K6, STM32F334K8, - STM32F334C4, STM32F334C6, STM32F334C8, - STM32F334R4, STM32F334R6 and STM32F334R8 Devices */ - /* #define STM32F318xx */ /*!< STM32F318K8, STM32F318C8: STM32F301x8 with regulator off: STM32F318xx Devices */ - /* #define STM32F328xx */ /*!< STM32F328C8, STM32F328R8: STM32F334x8 with regulator off: STM32F328xx Devices */ - /* #define STM32F358xx */ /*!< STM32F358CC, STM32F358RC, STM32F358VC: STM32F303xC with regulator off: STM32F358xx Devices */ - /* #define STM32F378xx */ /*!< STM32F378CC, STM32F378RC, STM32F378VC: STM32F373xC with regulator off: STM32F378xx Devices */ - /* #define STM32F398xx */ /*!< STM32F398VE: STM32F303xE with regulator off: STM32F398xx Devices */ -#endif - -/* Tip: To avoid modifying this file each time you need to switch between these - devices, you can define the device in your toolchain compiler preprocessor. - */ -#if !defined (USE_HAL_DRIVER) -/** - * @brief Comment the line below if you will not use the peripherals drivers. - In this case, these drivers will not be included and the application code will - be based on direct access to peripherals registers - */ -#define USE_HAL_DRIVER -#endif /* USE_HAL_DRIVER */ - -/** - * @brief CMSIS Device version number V2.3.2 - */ -#define __STM32F3_CMSIS_VERSION_MAIN (0x02) /*!< [31:24] main version */ -#define __STM32F3_CMSIS_VERSION_SUB1 (0x03) /*!< [23:16] sub1 version */ -#define __STM32F3_CMSIS_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */ -#define __STM32F3_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */ -#define __STM32F3_CMSIS_VERSION ((__STM32F3_CMSIS_VERSION_MAIN << 24)\ - |(__STM32F3_CMSIS_VERSION_SUB1 << 16)\ - |(__STM32F3_CMSIS_VERSION_SUB2 << 8 )\ - |(__STM32F3_CMSIS_VERSION_RC)) - -/** - * @} - */ - -/** @addtogroup Device_Included - * @{ - */ - -#if defined(STM32F301x8) - #include "stm32f301x8.h" -#elif defined(STM32F302x8) - #include "stm32f302x8.h" -#elif defined(STM32F302xC) - #include "stm32f302xc.h" -#elif defined(STM32F302xE) - #include "stm32f302xe.h" -#elif defined(STM32F303x8) - #include "stm32f303x8.h" -#elif defined(STM32F303xC) - #include "stm32f303xc.h" -#elif defined(STM32F303xE) - #include "stm32f303xe.h" -#elif defined(STM32F373xC) - #include "stm32f373xc.h" -#elif defined(STM32F334x8) - #include "stm32f334x8.h" -#elif defined(STM32F318xx) - #include "stm32f318xx.h" -#elif defined(STM32F328xx) - #include "stm32f328xx.h" -#elif defined(STM32F358xx) - #include "stm32f358xx.h" -#elif defined(STM32F378xx) - #include "stm32f378xx.h" -#elif defined(STM32F398xx) - #include "stm32f398xx.h" -#else - #error "Please select first the target STM32F3xx device used in your application (in stm32f3xx.h file)" -#endif - -/** - * @} - */ - -/** @addtogroup Exported_types - * @{ - */ -typedef enum -{ - RESET = 0, - SET = !RESET -} FlagStatus, ITStatus; - -typedef enum -{ - DISABLE = 0, - ENABLE = !DISABLE -} FunctionalState; -#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) - -typedef enum -{ - ERROR = 0, - SUCCESS = !ERROR -} ErrorStatus; - -/** - * @} - */ - - -/** @addtogroup Exported_macros - * @{ - */ -#define SET_BIT(REG, BIT) ((REG) |= (BIT)) - -#define CLEAR_BIT(REG, BIT) ((REG) &= ~(BIT)) - -#define READ_BIT(REG, BIT) ((REG) & (BIT)) - -#define CLEAR_REG(REG) ((REG) = (0x0)) - -#define WRITE_REG(REG, VAL) ((REG) = (VAL)) - -#define READ_REG(REG) ((REG)) - -#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK))) - -#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL))) - - -#if defined (USE_HAL_DRIVER) - #include "stm32f3xx_hal.h" -#endif /* USE_HAL_DRIVER */ - - -/** - * @} - */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __STM32F3xx_H */ -/** - * @} - */ - -/** - * @} - */ - - - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/us_ticker_data.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/us_ticker_data.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/us_ticker_data.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_ARM/startup_stm32f303x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_ARM/startup_stm32f303x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_ARM/startup_stm32f303x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_ARM/startup_stm32f303x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_ARM/stm32f303x8.sct b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_ARM/stm32f303x8.sct similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_ARM/stm32f303x8.sct rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_ARM/stm32f303x8.sct diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_GCC_ARM/STM32F303X8.ld b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_GCC_ARM/STM32F303X8.ld similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_GCC_ARM/STM32F303X8.ld rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_GCC_ARM/STM32F303X8.ld diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_GCC_ARM/startup_stm32f303x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_GCC_ARM/startup_stm32f303x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_GCC_ARM/startup_stm32f303x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_GCC_ARM/startup_stm32f303x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_IAR/startup_stm32f303x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_IAR/startup_stm32f303x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_IAR/startup_stm32f303x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_IAR/startup_stm32f303x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_IAR/stm32f303x8.icf b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_IAR/stm32f303x8.icf similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/TOOLCHAIN_IAR/stm32f303x8.icf rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TOOLCHAIN_IAR/stm32f303x8.icf diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/cmsis_nvic.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/cmsis_nvic.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/cmsis_nvic.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/stm32f3xx.h deleted file mode 100644 index faf2638c0e..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/stm32f3xx.h +++ /dev/null @@ -1,250 +0,0 @@ -/** - ****************************************************************************** - * @file stm32f3xx.h - * @author MCD Application Team - * @brief CMSIS STM32F3xx Device Peripheral Access Layer Header File. - * - * The file is the unique include file that the application programmer - * is using in the C source code, usually in main.c. This file contains: - * - Configuration section that allows to select: - * - The STM32F3xx device used in the target application - * - To use or not the peripheral’s drivers in application code(i.e. - * code will be based on direct access to peripheral’s registers - * rather than drivers API), this option is controlled by - * "#define USE_HAL_DRIVER" - * - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2016 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f3xx - * @{ - */ - -#ifndef __STM32F3xx_H -#define __STM32F3xx_H - -#ifdef __cplusplus - extern "C" { -#endif /* __cplusplus */ - -/** @addtogroup Library_configuration_section - * @{ - */ - -/** - * @brief STM32 Family - */ -#if !defined (STM32F3) -#define STM32F3 -#endif /* STM32F3 */ - -/* Uncomment the line below according to the target STM32 device used in your - application - */ - -#if !defined (STM32F301x8) && !defined (STM32F302x8) && !defined (STM32F318xx) && \ - !defined (STM32F302xC) && !defined (STM32F303xC) && !defined (STM32F358xx) && \ - !defined (STM32F303x8) && !defined (STM32F334x8) && !defined (STM32F328xx) && \ - !defined (STM32F302xE) && !defined (STM32F303xE) && !defined (STM32F398xx) && \ - !defined (STM32F373xC) && !defined (STM32F378xx) - - /* #define STM32F301x8 */ /*!< STM32F301K6, STM32F301K8, STM32F301C6, STM32F301C8, - STM32F301R6 and STM32F301R8 Devices */ - /* #define STM32F302x8 */ /*!< STM32F302K6, STM32F302K8, STM32F302C6, STM32F302C8, - STM32F302R6 and STM32F302R8 Devices */ - /* #define STM32F302xC */ /*!< STM32F302CB, STM32F302CC, STM32F302RB, STM32F302RC, - STM32F302VB and STM32F302VC Devices */ - /* #define STM32F302xE */ /*!< STM32F302RE, STM32F302VE, STM32F302ZE, STM32F302RD, - STM32F302VD and STM32F302ZD Devices */ - #define STM32F303x8 /*!< STM32F303K6, STM32F303K8, STM32F303C6, STM32F303C8, - STM32F303R6 and STM32F303R8 Devices */ - /* #define STM32F303xC */ /*!< STM32F303CB, STM32F303CC, STM32F303RB, STM32F303RC, - STM32F303VB and STM32F303VC Devices */ - /* #define STM32F303xE */ /*!< STM32F303RE, STM32F303VE, STM32F303ZE, STM32F303RD, - STM32F303VD and STM32F303ZD Devices */ - /* #define STM32F373xC */ /*!< STM32F373C8, STM32F373CB, STM32F373CC, - STM32F373R8, STM32F373RB, STM32F373RC, - STM32F373V8, STM32F373VB and STM32F373VC Devices */ - /* #define STM32F334x8 */ /*!< STM32F334K4, STM32F334K6, STM32F334K8, - STM32F334C4, STM32F334C6, STM32F334C8, - STM32F334R4, STM32F334R6 and STM32F334R8 Devices */ - /* #define STM32F318xx */ /*!< STM32F318K8, STM32F318C8: STM32F301x8 with regulator off: STM32F318xx Devices */ - /* #define STM32F328xx */ /*!< STM32F328C8, STM32F328R8: STM32F334x8 with regulator off: STM32F328xx Devices */ - /* #define STM32F358xx */ /*!< STM32F358CC, STM32F358RC, STM32F358VC: STM32F303xC with regulator off: STM32F358xx Devices */ - /* #define STM32F378xx */ /*!< STM32F378CC, STM32F378RC, STM32F378VC: STM32F373xC with regulator off: STM32F378xx Devices */ - /* #define STM32F398xx */ /*!< STM32F398VE: STM32F303xE with regulator off: STM32F398xx Devices */ -#endif - -/* Tip: To avoid modifying this file each time you need to switch between these - devices, you can define the device in your toolchain compiler preprocessor. - */ -#if !defined (USE_HAL_DRIVER) -/** - * @brief Comment the line below if you will not use the peripherals drivers. - In this case, these drivers will not be included and the application code will - be based on direct access to peripherals registers - */ -#define USE_HAL_DRIVER -#endif /* USE_HAL_DRIVER */ - -/** - * @brief CMSIS Device version number V2.3.2 - */ -#define __STM32F3_CMSIS_VERSION_MAIN (0x02) /*!< [31:24] main version */ -#define __STM32F3_CMSIS_VERSION_SUB1 (0x03) /*!< [23:16] sub1 version */ -#define __STM32F3_CMSIS_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */ -#define __STM32F3_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */ -#define __STM32F3_CMSIS_VERSION ((__STM32F3_CMSIS_VERSION_MAIN << 24)\ - |(__STM32F3_CMSIS_VERSION_SUB1 << 16)\ - |(__STM32F3_CMSIS_VERSION_SUB2 << 8 )\ - |(__STM32F3_CMSIS_VERSION_RC)) - -/** - * @} - */ - -/** @addtogroup Device_Included - * @{ - */ - -#if defined(STM32F301x8) - #include "stm32f301x8.h" -#elif defined(STM32F302x8) - #include "stm32f302x8.h" -#elif defined(STM32F302xC) - #include "stm32f302xc.h" -#elif defined(STM32F302xE) - #include "stm32f302xe.h" -#elif defined(STM32F303x8) - #include "stm32f303x8.h" -#elif defined(STM32F303xC) - #include "stm32f303xc.h" -#elif defined(STM32F303xE) - #include "stm32f303xe.h" -#elif defined(STM32F373xC) - #include "stm32f373xc.h" -#elif defined(STM32F334x8) - #include "stm32f334x8.h" -#elif defined(STM32F318xx) - #include "stm32f318xx.h" -#elif defined(STM32F328xx) - #include "stm32f328xx.h" -#elif defined(STM32F358xx) - #include "stm32f358xx.h" -#elif defined(STM32F378xx) - #include "stm32f378xx.h" -#elif defined(STM32F398xx) - #include "stm32f398xx.h" -#else - #error "Please select first the target STM32F3xx device used in your application (in stm32f3xx.h file)" -#endif - -/** - * @} - */ - -/** @addtogroup Exported_types - * @{ - */ -typedef enum -{ - RESET = 0, - SET = !RESET -} FlagStatus, ITStatus; - -typedef enum -{ - DISABLE = 0, - ENABLE = !DISABLE -} FunctionalState; -#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) - -typedef enum -{ - ERROR = 0, - SUCCESS = !ERROR -} ErrorStatus; - -/** - * @} - */ - - -/** @addtogroup Exported_macros - * @{ - */ -#define SET_BIT(REG, BIT) ((REG) |= (BIT)) - -#define CLEAR_BIT(REG, BIT) ((REG) &= ~(BIT)) - -#define READ_BIT(REG, BIT) ((REG) & (BIT)) - -#define CLEAR_REG(REG) ((REG) = (0x0)) - -#define WRITE_REG(REG, VAL) ((REG) = (VAL)) - -#define READ_REG(REG) ((REG)) - -#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK))) - -#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL))) - - -#if defined (USE_HAL_DRIVER) - #include "stm32f3xx_hal.h" -#endif /* USE_HAL_DRIVER */ - - -/** - * @} - */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __STM32F3xx_H */ -/** - * @} - */ - -/** - * @} - */ - - - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/system_stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/system_stm32f3xx.h deleted file mode 100644 index da033e5961..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/system_stm32f3xx.h +++ /dev/null @@ -1,124 +0,0 @@ -/** - ****************************************************************************** - * @file system_stm32f3xx.h - * @author MCD Application Team - * @brief CMSIS Cortex-M4 Device System Source File for STM32F3xx devices. - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2016 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f3xx_system - * @{ - */ - -/** - * @brief Define to prevent recursive inclusion - */ -#ifndef __SYSTEM_STM32F3XX_H -#define __SYSTEM_STM32F3XX_H - -#ifdef __cplusplus - extern "C" { -#endif - -/** @addtogroup STM32F3xx_System_Includes - * @{ - */ - -/** - * @} - */ - - -/** @addtogroup STM32F3xx_System_Exported_types - * @{ - */ - /* This variable is updated in three ways: - 1) by calling CMSIS function SystemCoreClockUpdate() - 3) by calling HAL API function HAL_RCC_GetHCLKFreq() - 3) by calling HAL API function HAL_RCC_ClockConfig() - Note: If you use this function to configure the system clock; then there - is no need to call the 2 first functions listed above, since SystemCoreClock - variable is updated automatically. - */ -extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */ -extern const uint8_t AHBPrescTable[16]; /*!< AHB prescalers table values */ -extern const uint8_t APBPrescTable[8]; /*!< APB prescalers table values */ - - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Constants - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Macros - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Functions - * @{ - */ - -extern void SystemInit(void); -extern void SystemCoreClockUpdate(void); -extern void SetSysClock(void); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /*__SYSTEM_STM32F3XX_H */ - -/** - * @} - */ - -/** - * @} - */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/us_ticker_data.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/us_ticker_data.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/us_ticker_data.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_ARM/startup_stm32f303xc.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_ARM/startup_stm32f303xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_ARM/startup_stm32f303xc.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_ARM/startup_stm32f303xc.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_ARM/stm32f303xc.sct b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_ARM/stm32f303xc.sct similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_ARM/stm32f303xc.sct rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_ARM/stm32f303xc.sct diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_GCC_ARM/STM32F303XC.ld b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_GCC_ARM/STM32F303XC.ld similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_GCC_ARM/STM32F303XC.ld rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_GCC_ARM/STM32F303XC.ld diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_GCC_ARM/startup_stm32f303xc.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_GCC_ARM/startup_stm32f303xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_GCC_ARM/startup_stm32f303xc.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_GCC_ARM/startup_stm32f303xc.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_IAR/startup_stm32f303xc.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_IAR/startup_stm32f303xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_IAR/startup_stm32f303xc.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_IAR/startup_stm32f303xc.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_IAR/stm32f303xc.icf b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_IAR/stm32f303xc.icf similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/TOOLCHAIN_IAR/stm32f303xc.icf rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TOOLCHAIN_IAR/stm32f303xc.icf diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/cmsis_nvic.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/cmsis_nvic.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/cmsis_nvic.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/stm32f3xx.h deleted file mode 100644 index ebf1c77d2c..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/stm32f3xx.h +++ /dev/null @@ -1,250 +0,0 @@ -/** - ****************************************************************************** - * @file stm32f3xx.h - * @author MCD Application Team - * @brief CMSIS STM32F3xx Device Peripheral Access Layer Header File. - * - * The file is the unique include file that the application programmer - * is using in the C source code, usually in main.c. This file contains: - * - Configuration section that allows to select: - * - The STM32F3xx device used in the target application - * - To use or not the peripheral’s drivers in application code(i.e. - * code will be based on direct access to peripheral’s registers - * rather than drivers API), this option is controlled by - * "#define USE_HAL_DRIVER" - * - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2016 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f3xx - * @{ - */ - -#ifndef __STM32F3xx_H -#define __STM32F3xx_H - -#ifdef __cplusplus - extern "C" { -#endif /* __cplusplus */ - -/** @addtogroup Library_configuration_section - * @{ - */ - -/** - * @brief STM32 Family - */ -#if !defined (STM32F3) -#define STM32F3 -#endif /* STM32F3 */ - -/* Uncomment the line below according to the target STM32 device used in your - application - */ - -#if !defined (STM32F301x8) && !defined (STM32F302x8) && !defined (STM32F318xx) && \ - !defined (STM32F302xC) && !defined (STM32F303xC) && !defined (STM32F358xx) && \ - !defined (STM32F303x8) && !defined (STM32F334x8) && !defined (STM32F328xx) && \ - !defined (STM32F302xE) && !defined (STM32F303xE) && !defined (STM32F398xx) && \ - !defined (STM32F373xC) && !defined (STM32F378xx) - - /* #define STM32F301x8 */ /*!< STM32F301K6, STM32F301K8, STM32F301C6, STM32F301C8, - STM32F301R6 and STM32F301R8 Devices */ - /* #define STM32F302x8 */ /*!< STM32F302K6, STM32F302K8, STM32F302C6, STM32F302C8, - STM32F302R6 and STM32F302R8 Devices */ - /* #define STM32F302xC */ /*!< STM32F302CB, STM32F302CC, STM32F302RB, STM32F302RC, - STM32F302VB and STM32F302VC Devices */ - /* #define STM32F302xE */ /*!< STM32F302RE, STM32F302VE, STM32F302ZE, STM32F302RD, - STM32F302VD and STM32F302ZD Devices */ - /* #define STM32F303x8 */ /*!< STM32F303K6, STM32F303K8, STM32F303C6, STM32F303C8, - STM32F303R6 and STM32F303R8 Devices */ - #define STM32F303xC /*!< STM32F303CB, STM32F303CC, STM32F303RB, STM32F303RC, - STM32F303VB and STM32F303VC Devices */ - /* #define STM32F303xE */ /*!< STM32F303RE, STM32F303VE, STM32F303ZE, STM32F303RD, - STM32F303VD and STM32F303ZD Devices */ - /* #define STM32F373xC */ /*!< STM32F373C8, STM32F373CB, STM32F373CC, - STM32F373R8, STM32F373RB, STM32F373RC, - STM32F373V8, STM32F373VB and STM32F373VC Devices */ - /* #define STM32F334x8 */ /*!< STM32F334K4, STM32F334K6, STM32F334K8, - STM32F334C4, STM32F334C6, STM32F334C8, - STM32F334R4, STM32F334R6 and STM32F334R8 Devices */ - /* #define STM32F318xx */ /*!< STM32F318K8, STM32F318C8: STM32F301x8 with regulator off: STM32F318xx Devices */ - /* #define STM32F328xx */ /*!< STM32F328C8, STM32F328R8: STM32F334x8 with regulator off: STM32F328xx Devices */ - /* #define STM32F358xx */ /*!< STM32F358CC, STM32F358RC, STM32F358VC: STM32F303xC with regulator off: STM32F358xx Devices */ - /* #define STM32F378xx */ /*!< STM32F378CC, STM32F378RC, STM32F378VC: STM32F373xC with regulator off: STM32F378xx Devices */ - /* #define STM32F398xx */ /*!< STM32F398VE: STM32F303xE with regulator off: STM32F398xx Devices */ -#endif - -/* Tip: To avoid modifying this file each time you need to switch between these - devices, you can define the device in your toolchain compiler preprocessor. - */ -#if !defined (USE_HAL_DRIVER) -/** - * @brief Comment the line below if you will not use the peripherals drivers. - In this case, these drivers will not be included and the application code will - be based on direct access to peripherals registers - */ -#define USE_HAL_DRIVER -#endif /* USE_HAL_DRIVER */ - -/** - * @brief CMSIS Device version number V2.3.2 - */ -#define __STM32F3_CMSIS_VERSION_MAIN (0x02) /*!< [31:24] main version */ -#define __STM32F3_CMSIS_VERSION_SUB1 (0x03) /*!< [23:16] sub1 version */ -#define __STM32F3_CMSIS_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */ -#define __STM32F3_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */ -#define __STM32F3_CMSIS_VERSION ((__STM32F3_CMSIS_VERSION_MAIN << 24)\ - |(__STM32F3_CMSIS_VERSION_SUB1 << 16)\ - |(__STM32F3_CMSIS_VERSION_SUB2 << 8 )\ - |(__STM32F3_CMSIS_VERSION_RC)) - -/** - * @} - */ - -/** @addtogroup Device_Included - * @{ - */ - -#if defined(STM32F301x8) - #include "stm32f301x8.h" -#elif defined(STM32F302x8) - #include "stm32f302x8.h" -#elif defined(STM32F302xC) - #include "stm32f302xc.h" -#elif defined(STM32F302xE) - #include "stm32f302xe.h" -#elif defined(STM32F303x8) - #include "stm32f303x8.h" -#elif defined(STM32F303xC) - #include "stm32f303xc.h" -#elif defined(STM32F303xE) - #include "stm32f303xe.h" -#elif defined(STM32F373xC) - #include "stm32f373xc.h" -#elif defined(STM32F334x8) - #include "stm32f334x8.h" -#elif defined(STM32F318xx) - #include "stm32f318xx.h" -#elif defined(STM32F328xx) - #include "stm32f328xx.h" -#elif defined(STM32F358xx) - #include "stm32f358xx.h" -#elif defined(STM32F378xx) - #include "stm32f378xx.h" -#elif defined(STM32F398xx) - #include "stm32f398xx.h" -#else - #error "Please select first the target STM32F3xx device used in your application (in stm32f3xx.h file)" -#endif - -/** - * @} - */ - -/** @addtogroup Exported_types - * @{ - */ -typedef enum -{ - RESET = 0, - SET = !RESET -} FlagStatus, ITStatus; - -typedef enum -{ - DISABLE = 0, - ENABLE = !DISABLE -} FunctionalState; -#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) - -typedef enum -{ - ERROR = 0, - SUCCESS = !ERROR -} ErrorStatus; - -/** - * @} - */ - - -/** @addtogroup Exported_macros - * @{ - */ -#define SET_BIT(REG, BIT) ((REG) |= (BIT)) - -#define CLEAR_BIT(REG, BIT) ((REG) &= ~(BIT)) - -#define READ_BIT(REG, BIT) ((REG) & (BIT)) - -#define CLEAR_REG(REG) ((REG) = (0x0)) - -#define WRITE_REG(REG, VAL) ((REG) = (VAL)) - -#define READ_REG(REG) ((REG)) - -#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK))) - -#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL))) - - -#if defined (USE_HAL_DRIVER) - #include "stm32f3xx_hal.h" -#endif /* USE_HAL_DRIVER */ - - -/** - * @} - */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __STM32F3xx_H */ -/** - * @} - */ - -/** - * @} - */ - - - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/system_stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/system_stm32f3xx.h deleted file mode 100644 index da033e5961..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/system_stm32f3xx.h +++ /dev/null @@ -1,124 +0,0 @@ -/** - ****************************************************************************** - * @file system_stm32f3xx.h - * @author MCD Application Team - * @brief CMSIS Cortex-M4 Device System Source File for STM32F3xx devices. - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2016 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f3xx_system - * @{ - */ - -/** - * @brief Define to prevent recursive inclusion - */ -#ifndef __SYSTEM_STM32F3XX_H -#define __SYSTEM_STM32F3XX_H - -#ifdef __cplusplus - extern "C" { -#endif - -/** @addtogroup STM32F3xx_System_Includes - * @{ - */ - -/** - * @} - */ - - -/** @addtogroup STM32F3xx_System_Exported_types - * @{ - */ - /* This variable is updated in three ways: - 1) by calling CMSIS function SystemCoreClockUpdate() - 3) by calling HAL API function HAL_RCC_GetHCLKFreq() - 3) by calling HAL API function HAL_RCC_ClockConfig() - Note: If you use this function to configure the system clock; then there - is no need to call the 2 first functions listed above, since SystemCoreClock - variable is updated automatically. - */ -extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */ -extern const uint8_t AHBPrescTable[16]; /*!< AHB prescalers table values */ -extern const uint8_t APBPrescTable[8]; /*!< APB prescalers table values */ - - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Constants - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Macros - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Functions - * @{ - */ - -extern void SystemInit(void); -extern void SystemCoreClockUpdate(void); -extern void SetSysClock(void); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /*__SYSTEM_STM32F3XX_H */ - -/** - * @} - */ - -/** - * @} - */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/us_ticker_data.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/us_ticker_data.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/us_ticker_data.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_ARM/startup_stm32f303xe.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_ARM/startup_stm32f303xe.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_ARM/startup_stm32f303xe.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_ARM/startup_stm32f303xe.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_ARM/stm32f303xe.sct b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_ARM/stm32f303xe.sct similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_ARM/stm32f303xe.sct rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_ARM/stm32f303xe.sct diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_GCC_ARM/STM32F303XE.ld b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_GCC_ARM/STM32F303XE.ld similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_GCC_ARM/STM32F303XE.ld rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_GCC_ARM/STM32F303XE.ld diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_GCC_ARM/startup_stm32f303xe.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_GCC_ARM/startup_stm32f303xe.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_GCC_ARM/startup_stm32f303xe.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_GCC_ARM/startup_stm32f303xe.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_IAR/startup_stm32f303xe.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_IAR/startup_stm32f303xe.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_IAR/startup_stm32f303xe.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_IAR/startup_stm32f303xe.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_IAR/stm32f303xe.icf b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_IAR/stm32f303xe.icf similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/TOOLCHAIN_IAR/stm32f303xe.icf rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TOOLCHAIN_IAR/stm32f303xe.icf diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/cmsis_nvic.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/cmsis_nvic.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/cmsis_nvic.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/stm32f3xx.h deleted file mode 100644 index 0db471f834..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/stm32f3xx.h +++ /dev/null @@ -1,250 +0,0 @@ -/** - ****************************************************************************** - * @file stm32f3xx.h - * @author MCD Application Team - * @brief CMSIS STM32F3xx Device Peripheral Access Layer Header File. - * - * The file is the unique include file that the application programmer - * is using in the C source code, usually in main.c. This file contains: - * - Configuration section that allows to select: - * - The STM32F3xx device used in the target application - * - To use or not the peripheral’s drivers in application code(i.e. - * code will be based on direct access to peripheral’s registers - * rather than drivers API), this option is controlled by - * "#define USE_HAL_DRIVER" - * - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2016 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f3xx - * @{ - */ - -#ifndef __STM32F3xx_H -#define __STM32F3xx_H - -#ifdef __cplusplus - extern "C" { -#endif /* __cplusplus */ - -/** @addtogroup Library_configuration_section - * @{ - */ - -/** - * @brief STM32 Family - */ -#if !defined (STM32F3) -#define STM32F3 -#endif /* STM32F3 */ - -/* Uncomment the line below according to the target STM32 device used in your - application - */ - -#if !defined (STM32F301x8) && !defined (STM32F302x8) && !defined (STM32F318xx) && \ - !defined (STM32F302xC) && !defined (STM32F303xC) && !defined (STM32F358xx) && \ - !defined (STM32F303x8) && !defined (STM32F334x8) && !defined (STM32F328xx) && \ - !defined (STM32F302xE) && !defined (STM32F303xE) && !defined (STM32F398xx) && \ - !defined (STM32F373xC) && !defined (STM32F378xx) - - /* #define STM32F301x8 */ /*!< STM32F301K6, STM32F301K8, STM32F301C6, STM32F301C8, - STM32F301R6 and STM32F301R8 Devices */ - /* #define STM32F302x8 */ /*!< STM32F302K6, STM32F302K8, STM32F302C6, STM32F302C8, - STM32F302R6 and STM32F302R8 Devices */ - /* #define STM32F302xC */ /*!< STM32F302CB, STM32F302CC, STM32F302RB, STM32F302RC, - STM32F302VB and STM32F302VC Devices */ - /* #define STM32F302xE */ /*!< STM32F302RE, STM32F302VE, STM32F302ZE, STM32F302RD, - STM32F302VD and STM32F302ZD Devices */ - /* #define STM32F303x8 */ /*!< STM32F303K6, STM32F303K8, STM32F303C6, STM32F303C8, - STM32F303R6 and STM32F303R8 Devices */ - /* #define STM32F303xC */ /*!< STM32F303CB, STM32F303CC, STM32F303RB, STM32F303RC, - STM32F303VB and STM32F303VC Devices */ -#define STM32F303xE /*!< STM32F303RE, STM32F303VE, STM32F303ZE, STM32F303RD, - STM32F303VD and STM32F303ZD Devices */ - /* #define STM32F373xC */ /*!< STM32F373C8, STM32F373CB, STM32F373CC, - STM32F373R8, STM32F373RB, STM32F373RC, - STM32F373V8, STM32F373VB and STM32F373VC Devices */ - /* #define STM32F334x8 */ /*!< STM32F334K4, STM32F334K6, STM32F334K8, - STM32F334C4, STM32F334C6, STM32F334C8, - STM32F334R4, STM32F334R6 and STM32F334R8 Devices */ - /* #define STM32F318xx */ /*!< STM32F318K8, STM32F318C8: STM32F301x8 with regulator off: STM32F318xx Devices */ - /* #define STM32F328xx */ /*!< STM32F328C8, STM32F328R8: STM32F334x8 with regulator off: STM32F328xx Devices */ - /* #define STM32F358xx */ /*!< STM32F358CC, STM32F358RC, STM32F358VC: STM32F303xC with regulator off: STM32F358xx Devices */ - /* #define STM32F378xx */ /*!< STM32F378CC, STM32F378RC, STM32F378VC: STM32F373xC with regulator off: STM32F378xx Devices */ - /* #define STM32F398xx */ /*!< STM32F398VE: STM32F303xE with regulator off: STM32F398xx Devices */ -#endif - -/* Tip: To avoid modifying this file each time you need to switch between these - devices, you can define the device in your toolchain compiler preprocessor. - */ -#if !defined (USE_HAL_DRIVER) -/** - * @brief Comment the line below if you will not use the peripherals drivers. - In this case, these drivers will not be included and the application code will - be based on direct access to peripherals registers - */ -#define USE_HAL_DRIVER -#endif /* USE_HAL_DRIVER */ - -/** - * @brief CMSIS Device version number V2.3.2 - */ -#define __STM32F3_CMSIS_VERSION_MAIN (0x02) /*!< [31:24] main version */ -#define __STM32F3_CMSIS_VERSION_SUB1 (0x03) /*!< [23:16] sub1 version */ -#define __STM32F3_CMSIS_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */ -#define __STM32F3_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */ -#define __STM32F3_CMSIS_VERSION ((__STM32F3_CMSIS_VERSION_MAIN << 24)\ - |(__STM32F3_CMSIS_VERSION_SUB1 << 16)\ - |(__STM32F3_CMSIS_VERSION_SUB2 << 8 )\ - |(__STM32F3_CMSIS_VERSION_RC)) - -/** - * @} - */ - -/** @addtogroup Device_Included - * @{ - */ - -#if defined(STM32F301x8) - #include "stm32f301x8.h" -#elif defined(STM32F302x8) - #include "stm32f302x8.h" -#elif defined(STM32F302xC) - #include "stm32f302xc.h" -#elif defined(STM32F302xE) - #include "stm32f302xe.h" -#elif defined(STM32F303x8) - #include "stm32f303x8.h" -#elif defined(STM32F303xC) - #include "stm32f303xc.h" -#elif defined(STM32F303xE) - #include "stm32f303xe.h" -#elif defined(STM32F373xC) - #include "stm32f373xc.h" -#elif defined(STM32F334x8) - #include "stm32f334x8.h" -#elif defined(STM32F318xx) - #include "stm32f318xx.h" -#elif defined(STM32F328xx) - #include "stm32f328xx.h" -#elif defined(STM32F358xx) - #include "stm32f358xx.h" -#elif defined(STM32F378xx) - #include "stm32f378xx.h" -#elif defined(STM32F398xx) - #include "stm32f398xx.h" -#else - #error "Please select first the target STM32F3xx device used in your application (in stm32f3xx.h file)" -#endif - -/** - * @} - */ - -/** @addtogroup Exported_types - * @{ - */ -typedef enum -{ - RESET = 0, - SET = !RESET -} FlagStatus, ITStatus; - -typedef enum -{ - DISABLE = 0, - ENABLE = !DISABLE -} FunctionalState; -#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) - -typedef enum -{ - ERROR = 0, - SUCCESS = !ERROR -} ErrorStatus; - -/** - * @} - */ - - -/** @addtogroup Exported_macros - * @{ - */ -#define SET_BIT(REG, BIT) ((REG) |= (BIT)) - -#define CLEAR_BIT(REG, BIT) ((REG) &= ~(BIT)) - -#define READ_BIT(REG, BIT) ((REG) & (BIT)) - -#define CLEAR_REG(REG) ((REG) = (0x0)) - -#define WRITE_REG(REG, VAL) ((REG) = (VAL)) - -#define READ_REG(REG) ((REG)) - -#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK))) - -#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL))) - - -#if defined (USE_HAL_DRIVER) - #include "stm32f3xx_hal.h" -#endif /* USE_HAL_DRIVER */ - - -/** - * @} - */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __STM32F3xx_H */ -/** - * @} - */ - -/** - * @} - */ - - - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/system_stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/system_stm32f3xx.h deleted file mode 100644 index da033e5961..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/system_stm32f3xx.h +++ /dev/null @@ -1,124 +0,0 @@ -/** - ****************************************************************************** - * @file system_stm32f3xx.h - * @author MCD Application Team - * @brief CMSIS Cortex-M4 Device System Source File for STM32F3xx devices. - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2016 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f3xx_system - * @{ - */ - -/** - * @brief Define to prevent recursive inclusion - */ -#ifndef __SYSTEM_STM32F3XX_H -#define __SYSTEM_STM32F3XX_H - -#ifdef __cplusplus - extern "C" { -#endif - -/** @addtogroup STM32F3xx_System_Includes - * @{ - */ - -/** - * @} - */ - - -/** @addtogroup STM32F3xx_System_Exported_types - * @{ - */ - /* This variable is updated in three ways: - 1) by calling CMSIS function SystemCoreClockUpdate() - 3) by calling HAL API function HAL_RCC_GetHCLKFreq() - 3) by calling HAL API function HAL_RCC_ClockConfig() - Note: If you use this function to configure the system clock; then there - is no need to call the 2 first functions listed above, since SystemCoreClock - variable is updated automatically. - */ -extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */ -extern const uint8_t AHBPrescTable[16]; /*!< AHB prescalers table values */ -extern const uint8_t APBPrescTable[8]; /*!< APB prescalers table values */ - - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Constants - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Macros - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Functions - * @{ - */ - -extern void SystemInit(void); -extern void SystemCoreClockUpdate(void); -extern void SetSysClock(void); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /*__SYSTEM_STM32F3XX_H */ - -/** - * @} - */ - -/** - * @} - */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/us_ticker_data.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/us_ticker_data.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/us_ticker_data.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_ARM/startup_stm32f334x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_ARM/startup_stm32f334x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_ARM/startup_stm32f334x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_ARM/startup_stm32f334x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_ARM/stm32f334x8.sct b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_ARM/stm32f334x8.sct similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_ARM/stm32f334x8.sct rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_ARM/stm32f334x8.sct diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_GCC_ARM/STM32F334X8.ld b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_GCC_ARM/STM32F334X8.ld similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_GCC_ARM/STM32F334X8.ld rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_GCC_ARM/STM32F334X8.ld diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_GCC_ARM/startup_stm32f334x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_GCC_ARM/startup_stm32f334x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_GCC_ARM/startup_stm32f334x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_GCC_ARM/startup_stm32f334x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_IAR/startup_stm32f334x8.S b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_IAR/startup_stm32f334x8.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_IAR/startup_stm32f334x8.S rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_IAR/startup_stm32f334x8.S diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_IAR/stm32f334x8.icf b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_IAR/stm32f334x8.icf similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/TOOLCHAIN_IAR/stm32f334x8.icf rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/TOOLCHAIN_IAR/stm32f334x8.icf diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/cmsis_nvic.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/cmsis_nvic.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/cmsis_nvic.h diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/system_stm32f3xx.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/system_stm32f3xx.h deleted file mode 100644 index da033e5961..0000000000 --- a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/system_stm32f3xx.h +++ /dev/null @@ -1,124 +0,0 @@ -/** - ****************************************************************************** - * @file system_stm32f3xx.h - * @author MCD Application Team - * @brief CMSIS Cortex-M4 Device System Source File for STM32F3xx devices. - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2016 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32f3xx_system - * @{ - */ - -/** - * @brief Define to prevent recursive inclusion - */ -#ifndef __SYSTEM_STM32F3XX_H -#define __SYSTEM_STM32F3XX_H - -#ifdef __cplusplus - extern "C" { -#endif - -/** @addtogroup STM32F3xx_System_Includes - * @{ - */ - -/** - * @} - */ - - -/** @addtogroup STM32F3xx_System_Exported_types - * @{ - */ - /* This variable is updated in three ways: - 1) by calling CMSIS function SystemCoreClockUpdate() - 3) by calling HAL API function HAL_RCC_GetHCLKFreq() - 3) by calling HAL API function HAL_RCC_ClockConfig() - Note: If you use this function to configure the system clock; then there - is no need to call the 2 first functions listed above, since SystemCoreClock - variable is updated automatically. - */ -extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */ -extern const uint8_t AHBPrescTable[16]; /*!< AHB prescalers table values */ -extern const uint8_t APBPrescTable[8]; /*!< APB prescalers table values */ - - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Constants - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Macros - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32F3xx_System_Exported_Functions - * @{ - */ - -extern void SystemInit(void); -extern void SystemCoreClockUpdate(void); -extern void SetSysClock(void); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /*__SYSTEM_STM32F3XX_H */ - -/** - * @} - */ - -/** - * @} - */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/us_ticker_data.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/us_ticker_data.h rename to targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/us_ticker_data.h