STM32F2: alignment with other families

Author: jeromecoutant

targets/TARGET_STM/TARGET_STM32F2/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if("NUCLEO_F207ZG" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_NUCLEO_F207ZG)  
+    add_subdirectory(TARGET_STM32F207xG)
 endif()
 
 target_sources(mbed-core
@@ -15,73 +15,15 @@ target_sources(mbed-core
     serial_device.c
     spi_api.c
 
-    device/stm32f2xx_hal.c
-    device/stm32f2xx_hal_adc.c
-    device/stm32f2xx_hal_adc_ex.c
-    device/stm32f2xx_hal_can.c
-    device/stm32f2xx_hal_cortex.c
-    device/stm32f2xx_hal_crc.c
-    device/stm32f2xx_hal_cryp.c
-    device/stm32f2xx_hal_dac.c
-    device/stm32f2xx_hal_dac_ex.c
-    device/stm32f2xx_hal_dcmi.c
-    device/stm32f2xx_hal_dma.c
-    device/stm32f2xx_hal_dma_ex.c
-    device/stm32f2xx_hal_eth.c
-    device/stm32f2xx_hal_flash.c
-    device/stm32f2xx_hal_flash_ex.c
-    device/stm32f2xx_hal_gpio.c
-    device/stm32f2xx_hal_hash.c
-    device/stm32f2xx_hal_hcd.c
-    device/stm32f2xx_hal_i2c.c
-    device/stm32f2xx_hal_i2s.c
-    device/stm32f2xx_hal_irda.c
-    device/stm32f2xx_hal_iwdg.c
-    device/stm32f2xx_hal_mmc.c
-    device/stm32f2xx_hal_nand.c
-    device/stm32f2xx_hal_nor.c
-    device/stm32f2xx_hal_pccard.c
-    device/stm32f2xx_hal_pcd.c
-    device/stm32f2xx_hal_pcd_ex.c
-    device/stm32f2xx_hal_pwr.c
-    device/stm32f2xx_hal_pwr_ex.c
-    device/stm32f2xx_hal_rcc.c
-    device/stm32f2xx_hal_rcc_ex.c
-    device/stm32f2xx_hal_rng.c
-    device/stm32f2xx_hal_rtc.c
-    device/stm32f2xx_hal_rtc_ex.c
-    device/stm32f2xx_hal_sd.c
-    device/stm32f2xx_hal_smartcard.c
-    device/stm32f2xx_hal_spi.c
-    device/stm32f2xx_hal_sram.c
-    device/stm32f2xx_hal_tim.c
-    device/stm32f2xx_hal_tim_ex.c
-    device/stm32f2xx_hal_uart.c
-    device/stm32f2xx_hal_usart.c
-    device/stm32f2xx_hal_wwdg.c
-    device/stm32f2xx_ll_adc.c
-    device/stm32f2xx_ll_crc.c
-    device/stm32f2xx_ll_dac.c
-    device/stm32f2xx_ll_dma.c
-    device/stm32f2xx_ll_exti.c
-    device/stm32f2xx_ll_fsmc.c
-    device/stm32f2xx_ll_gpio.c
-    device/stm32f2xx_ll_i2c.c
-    device/stm32f2xx_ll_pwr.c
-    device/stm32f2xx_ll_rcc.c
-    device/stm32f2xx_ll_rng.c
-    device/stm32f2xx_ll_rtc.c
-    device/stm32f2xx_ll_sdmmc.c
-    device/stm32f2xx_ll_spi.c
-    device/stm32f2xx_ll_tim.c
-    device/stm32f2xx_ll_usart.c
-    device/stm32f2xx_ll_usb.c
-    device/stm32f2xx_ll_utils.c
-    device/system_stm32f2xx.c
 )
 
+add_subdirectory(STM32Cube_FW)
+
 target_include_directories(mbed-core
     INTERFACE
         .
-        device
+        ./STM32Cube_FW
+        ./STM32Cube_FW/CMSIS
+        ./STM32Cube_FW/STM32F2xx_HAL_Driver
+        ./STM32Cube_FW/STM32F2xx_HAL_Driver/Legacy
 )

targets/TARGET_STM/TARGET_STM32F2/TARGET_STM32F207xG/PeripheralNames.h renamed to targets/TARGET_STM/TARGET_STM32F2/PeripheralNames.h

@@ -4,17 +4,17 @@
   * @author  MCD Application Team
   * @version V2.2.0
   * @date    17-March-2017
-  * @brief   CMSIS STM32F2xx Device Peripheral Access Layer Header File.
+  * @brief   CMSIS STM32F2xx 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 STM32F2xx 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
+  *              - 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
   *
@@ -52,14 +52,14 @@
 /** @addtogroup stm32f2xx
   * @{
   */
-
+    
 #ifndef __STM32F2xx_H
 #define __STM32F2xx_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif /* __cplusplus */
-
+   
 /** @addtogroup Library_configuration_section
   * @{
   */
@@ -70,32 +70,32 @@ extern "C" {
 #if !defined (STM32F2)
 #define STM32F2
 #endif /* STM32F2 */
-
+   
 /* Uncomment the line below according to the target STM32 device used in your
-   application
+   application 
   */
 #if !defined (STM32F205xx) && !defined (STM32F215xx) && !defined (STM32F207xx) && !defined (STM32F217xx)
 
-/* #define STM32F205xx */   /*!< STM32F205RG, STM32F205VG, STM32F205ZG, STM32F205RF, STM32F205VF, STM32F205ZF,
-                                 STM32F205RE, STM32F205VE, STM32F205ZE, STM32F205RC, STM32F205VC, STM32F205ZC,
-                                 STM32F205RB and STM32F205VB Devices */
-/* #define STM32F215xx */   /*!< STM32F215RG, STM32F215VG, STM32F215ZG, STM32F215RE, STM32F215VE and STM32F215ZE Devices */
-#define STM32F207xx           /*!< STM32F207VG, STM32F207ZG, STM32F207IG, STM32F207VF, STM32F207ZF, STM32F207IF,
+  /* #define STM32F205xx */   /*!< STM32F205RG, STM32F205VG, STM32F205ZG, STM32F205RF, STM32F205VF, STM32F205ZF,
+                                   STM32F205RE, STM32F205VE, STM32F205ZE, STM32F205RC, STM32F205VC, STM32F205ZC,
+                                   STM32F205RB and STM32F205VB Devices */
+  /* #define STM32F215xx */   /*!< STM32F215RG, STM32F215VG, STM32F215ZG, STM32F215RE, STM32F215VE and STM32F215ZE Devices */
+  /* #define STM32F207xx */   /*!< STM32F207VG, STM32F207ZG, STM32F207IG, STM32F207VF, STM32F207ZF, STM32F207IF,
                                    STM32F207VE, STM32F207ZE, STM32F207IE, STM32F207VC, STM32F207ZC and STM32F207IC Devices */
-/* #define STM32F217xx */   /*!< STM32F217VG, STM32F217ZG, STM32F217IG, STM32F217VE, STM32F217ZE and STM32F217IE Devices */
-
+  /* #define STM32F217xx */   /*!< STM32F217VG, STM32F217ZG, STM32F217IG, STM32F217VE, STM32F217ZE and STM32F217IE 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
+   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
+  /*#define USE_HAL_DRIVER */
 #endif /* USE_HAL_DRIVER */
 
 /**
@@ -119,15 +119,15 @@ extern "C" {
   */
 
 #if defined(STM32F205xx)
-#include "stm32f205xx.h"
+  #include "stm32f205xx.h"
 #elif defined(STM32F215xx)
-#include "stm32f215xx.h"
+  #include "stm32f215xx.h"
 #elif defined(STM32F207xx)
-#include "stm32f207xx.h"
+  #include "stm32f207xx.h"
 #elif defined(STM32F217xx)
-#include "stm32f217xx.h"
+  #include "stm32f217xx.h"
 #else
-#error "Please select first the target STM32F2xx device used in your application (in stm32f2xx.h file)"
+ #error "Please select first the target STM32F2xx device used in your application (in stm32f2xx.h file)"
 #endif
 
 /**
@@ -136,21 +136,24 @@ extern "C" {
 
 /** @addtogroup Exported_types
   * @{
-  */
-typedef enum {
-    RESET = 0,
-    SET = !RESET
+  */ 
+typedef enum 
+{
+  RESET = 0, 
+  SET = !RESET
 } FlagStatus, ITStatus;
 
-typedef enum {
-    DISABLE = 0,
-    ENABLE = !DISABLE
+typedef enum 
+{
+  DISABLE = 0, 
+  ENABLE = !DISABLE
 } FunctionalState;
 #define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
 
-typedef enum {
-    ERROR = 0,
-    SUCCESS = !ERROR
+typedef enum 
+{
+  ERROR = 0, 
+  SUCCESS = !ERROR
 } ErrorStatus;
 
 /**
@@ -175,15 +178,15 @@ typedef enum {
 
 #define MODIFY_REG(REG, CLEARMASK, SETMASK)  WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK)))
 
-#define POSITION_VAL(VAL)     (__CLZ(__RBIT(VAL)))
+#define POSITION_VAL(VAL)     (__CLZ(__RBIT(VAL))) 
 
 
 /**
   * @}
   */
-
+  
 #if defined (USE_HAL_DRIVER)
-#include "stm32f2xx_hal.h"
+ #include "stm32f2xx_hal.h"
 #endif /* USE_HAL_DRIVER */
 
 #ifdef __cplusplus
@@ -199,7 +202,7 @@ typedef enum {
 /**
   * @}
   */
-
+  
 
 
 

targets/TARGET_STM/TARGET_STM32F2/STM32Cube_FW/CMSIS/stm32f2xx.h

@@ -4,7 +4,7 @@
   * @author  MCD Application Team
   * @version V2.2.0
   * @date    17-March-2017
-  * @brief   CMSIS Cortex-M3 Device System Source File for STM32F2xx devices.
+  * @brief   CMSIS Cortex-M3 Device System Source File for STM32F2xx devices.       
 ******************************************************************************
   * @attention
   *
@@ -32,26 +32,26 @@
   * 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 stm32f2xx_system
   * @{
-  */
-
+  */  
+  
 /**
   * @brief Define to prevent recursive inclusion
   */
 #ifndef __SYSTEM_STM32F2XX_H
 #define __SYSTEM_STM32F2XX_H
 
 #ifdef __cplusplus
-extern "C" {
-#endif
+ extern "C" {
+#endif 
 
 /** @addtogroup STM32F2xx_System_Includes
   * @{
@@ -65,14 +65,14 @@ extern "C" {
 /** @addtogroup STM32F2xx_System_Exported_types
   * @{
   */
-/* This variable is updated in three ways:
-    1) by calling CMSIS function SystemCoreClockUpdate()
-    2) by calling HAL API function HAL_RCC_GetSysClockFreq()
-    3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
-       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.
-*/
+  /* This variable is updated in three ways:
+      1) by calling CMSIS function SystemCoreClockUpdate()
+      2) by calling HAL API function HAL_RCC_GetSysClockFreq()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency 
+         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 */
@@ -101,10 +101,9 @@ extern const uint8_t  APBPrescTable[8];     /*!< APB prescalers table values */
 /** @addtogroup STM32F2xx_System_Exported_Functions
   * @{
   */
-
+  
 extern void SystemInit(void);
 extern void SystemCoreClockUpdate(void);
-extern void SetSysClock(void);
 /**
   * @}
   */
@@ -118,8 +117,8 @@ extern void SetSysClock(void);
 /**
   * @}
   */
-
+  
 /**
   * @}
-  */
+  */  
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/