RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #20617 from Enoch247/simplify-stm32-ifdefs

Browse Source 
boards/common/stm32: simplify ifdef logic
This commit is contained in:
benpicco 2024-04-24 12:57:47 +00:00 committed by GitHub
commit 772bc7a876
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/common/stm32/include/cfg_timer_tim2.h
View File

@ -37,10 +37,9 @@ static const timer_conf_t timer_config[] = {
#else
.max = 0xffffffff,
#endif
#if defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32WB) || \
defined(CPU_FAM_STM32WL) || defined(CPU_FAM_STM32G4)
#if defined(RCC_APB1ENR1_TIM2EN)
.rcc_mask = RCC_APB1ENR1_TIM2EN,
#elif CPU_FAM_STM32MP1
#elif defined(RCC_MC_APB1ENSETR_TIM2EN)
.rcc_mask = RCC_MC_APB1ENSETR_TIM2EN,
#else
.rcc_mask = RCC_APB1ENR_TIM2EN,

3
boards/common/stm32/include/cfg_timer_tim5.h
View File

@ -33,8 +33,7 @@ static const timer_conf_t timer_config[] = {
{
.dev = TIM5,
.max = 0xffffffff,
#if defined(CPU_FAM_STM32G4) || defined(CPU_FAM_STM32L5) || \
defined(CPU_FAM_STM32U5)
#if defined(RCC_APB1ENR1_TIM5EN)
.rcc_mask = RCC_APB1ENR1_TIM5EN,
#else
.rcc_mask = RCC_APB1ENR_TIM5EN,

8
boards/common/stm32/include/cfg_timer_tim5_and_tim2.h
View File

@ -37,8 +37,7 @@ static const timer_conf_t timer_config[] = {
{
.dev = TIM5,
.max = 0xffffffff,
#if defined(CPU_FAM_STM32G4) || defined(CPU_FAM_STM32L5) || \
defined(CPU_FAM_STM32U5)
#if defined(RCC_APB1ENR1_TIM5EN)
.rcc_mask = RCC_APB1ENR1_TIM5EN,
#else
.rcc_mask = RCC_APB1ENR_TIM5EN,
@ -53,10 +52,9 @@ static const timer_conf_t timer_config[] = {
#else
.max = 0xffffffff,
#endif
#if defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32WB) || \
defined(CPU_FAM_STM32WL) || defined(CPU_FAM_STM32G4)
#if defined(RCC_APB1ENR1_TIM2EN)
.rcc_mask = RCC_APB1ENR1_TIM2EN,
#elif CPU_FAM_STM32MP1
#elif defined(RCC_MC_APB1ENSETR_TIM2EN)
.rcc_mask = RCC_MC_APB1ENSETR_TIM2EN,
#else
.rcc_mask = RCC_APB1ENR_TIM2EN,