mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-25 10:43:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for STM32H503 MCU - review changes

Browse Source 
Implemented changes suggested in the review:
- restored original name of SystemClock_Config() function
- some GPIO clocks are only enabled if macros are defined
- moved GPIO clocks init back to family.c
This commit is contained in:
Wojciech Klimek 2024-04-01 14:51:46 +02:00
parent 943a2a6db3
commit 057278c0c6
5 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/bsp/stm32h5/boards/stm32h503nucleo/board.h
View File

@ -51,21 +51,14 @@ extern "C" {
#define UART_TX_PIN GPIO_PIN_3 #define UART_TX_PIN GPIO_PIN_3
#define UART_RX_PIN GPIO_PIN_4 #define UART_RX_PIN GPIO_PIN_4
// //--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// // RCC Clock // RCC Clock
// //--------------------------------------------------------------------+ //--------------------------------------------------------------------+
static inline void board_clock_init(void) static inline void SystemClock_Config(void)
{ {
RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_OscInitTypeDef RCC_OscInitStruct = {0};
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
// Enable All GPIOs clocks
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();
__HAL_RCC_GPIOH_CLK_ENABLE();
/** Configure the main internal regulator output voltage /** Configure the main internal regulator output voltage
*/ */
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE0); __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE0);

12
hw/bsp/stm32h5/boards/stm32h563nucleo/board.h
View File

@ -54,21 +54,11 @@ extern "C" {
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// RCC Clock // RCC Clock
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
static inline void board_clock_init(void) static inline void SystemClock_Config(void)
{ {
RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_OscInitTypeDef RCC_OscInitStruct = {0};
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
// Enable All GPIOs clocks
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();
__HAL_RCC_GPIOE_CLK_ENABLE();
__HAL_RCC_GPIOG_CLK_ENABLE();
__HAL_RCC_GPIOH_CLK_ENABLE();
__HAL_RCC_GPIOI_CLK_ENABLE();
/** Configure the main internal regulator output voltage /** Configure the main internal regulator output voltage
*/ */
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE0); __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE0);

12
hw/bsp/stm32h5/boards/stm32h573i_dk/board.h
View File

@ -54,20 +54,10 @@ extern "C" {
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// RCC Clock // RCC Clock
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
static inline void board_clock_init(void) { static inline void SystemClock_Config(void) {
RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_OscInitTypeDef RCC_OscInitStruct = {0};
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
// Enable All GPIOs clocks
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();
__HAL_RCC_GPIOE_CLK_ENABLE();
__HAL_RCC_GPIOG_CLK_ENABLE();
__HAL_RCC_GPIOH_CLK_ENABLE();
__HAL_RCC_GPIOI_CLK_ENABLE();
/** Configure the main internal regulator output voltage */ /** Configure the main internal regulator output voltage */
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1); HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);

19
hw/bsp/stm32h5/family.c
View File

@ -59,9 +59,26 @@ UART_HandleTypeDef UartHandle;
void board_init(void) { void board_init(void) {
HAL_Init(); // required for HAL_RCC_Osc TODO check with freeRTOS HAL_Init(); // required for HAL_RCC_Osc TODO check with freeRTOS
board_clock_init(); // implemented in board.h SystemClock_Config(); // implemented in board.h
SystemCoreClockUpdate(); SystemCoreClockUpdate();
// Enable All GPIOs clocks
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();
__HAL_RCC_GPIOH_CLK_ENABLE();
#ifdef __HAL_RCC_GPIOE_CLK_ENABLE
__HAL_RCC_GPIOE_CLK_ENABLE();
#endif
#ifdef __HAL_RCC_GPIOG_CLK_ENABLE
__HAL_RCC_GPIOE_CLK_ENABLE();
#endif
#ifdef __HAL_RCC_GPIOI_CLK_ENABLE
__HAL_RCC_GPIOE_CLK_ENABLE();
#endif
UART_CLK_EN(); UART_CLK_EN();
#if CFG_TUSB_OS == OPT_OS_NONE #if CFG_TUSB_OS == OPT_OS_NONE

2
src/portable/st/stm32_fsdev/dcd_stm32_fsdev.h
View File

@ -116,7 +116,7 @@
#include "stm32h5xx.h" #include "stm32h5xx.h"
#define FSDEV_BUS_32BIT #define FSDEV_BUS_32BIT
#ifdef STM32H503xx #if !defined(USB_DRD_BASE) && defined(USB_DRD_FS_BASE)
#define USB_DRD_BASE USB_DRD_FS_BASE #define USB_DRD_BASE USB_DRD_FS_BASE
#endif #endif