riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14131 from aabadie/pr/cpu/stmclk_cleanup

Browse Source 
cpu/stm32: move stmclk in its own module, remove useless ifdefs
This commit is contained in:
benpicco 2020-05-25 20:42:11 +02:00 committed by GitHub
commit 4f295a439b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/stm32/Makefile
View File

@ -1,5 +1,5 @@
MODULE = cpu MODULE = cpu
DIRS = $(RIOTCPU)/cortexm_common periph vectors DIRS = $(RIOTCPU)/cortexm_common periph stmclk vectors
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

4
cpu/stm32/Makefile.dep
View File

@ -1,8 +1,8 @@
# All stm32 families provide pm support # All stm32 families provide pm support
USEMODULE += pm_layered USEMODULE += pm_layered
# include stm32 common periph drivers # include stm32 common periph drivers, clock configurations and vectors
USEMODULE += periph stm32_vectors USEMODULE += periph stm32_clk stm32_vectors
ifneq (,$(filter periph_usbdev,$(FEATURES_USED))) ifneq (,$(filter periph_usbdev,$(FEATURES_USED)))
USEMODULE += xtimer USEMODULE += xtimer

14
cpu/stm32/stmclk/Makefile Normal file
View File

@ -0,0 +1,14 @@
MODULE = stm32_clk
SRC = stmclk_common.c
_CPU_FAM_SHORT = $(subst stm32,,$(CPU_FAM))
ifneq (,$(filter f%,$(_CPU_FAM_SHORT)))
SRC += stmclk_fx.c
else ifneq (,$(filter $(_CPU_FAM_SHORT),l0 l1))
SRC += stmclk_l0l1.c
else ifneq (,$(filter $(_CPU_FAM_SHORT),l4 wb))
SRC += stmclk_l4wb.c
endif
include $(RIOTBASE)/Makefile.base

0
cpu/stm32/stmclk_common.c → cpu/stm32/stmclk/stmclk_common.c
View File

11
cpu/stm32/stmclk.c → cpu/stm32/stmclk/stmclk_fx.c
View File

@ -12,17 +12,13 @@
* @{ * @{
* *
* @file * @file
* @brief Implementation of STM32 clock configuration * @brief Implementation of STM32 clock configuration for F0/F1/F2/F3/F4/F7 families
* *
* @author Hauke Petersen <hauke.petersen@fu-berlin.de> * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Vincent Dupont <vincent@otakeys.com> * @author Vincent Dupont <vincent@otakeys.com>
* @} * @}
*/ */
#if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || \
defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F3) || \
defined(CPU_FAM_STM32F4) || defined(CPU_FAM_STM32F7)
#include "cpu.h" #include "cpu.h"
#include "stmclk.h" #include "stmclk.h"
#include "periph_conf.h" #include "periph_conf.h"
@ -252,8 +248,3 @@ void stmclk_init_sysclk(void)
irq_restore(is); irq_restore(is);
} }
#else
typedef int dont_be_pedantic;
#endif /* defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) ||
* defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F3) ||
* defined(CPU_FAM_STM32F4) || defined(CPU_FAM_STM32F7) */

6
cpu/stm32/stmclk_l0l1.c → cpu/stm32/stmclk/stmclk_l0l1.c
View File

@ -13,7 +13,7 @@
* @{ * @{
* *
* @file * @file
* @brief Implementation of STM32 clock configuration * @brief Implementation of STM32 clock configuration for L0 and L1 families
* *
* @author Hauke Petersen <hauke.petersen@fu-berlin.de> * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Alexandre Abadie <alexandre.abadie@inria.fr> * @author Alexandre Abadie <alexandre.abadie@inria.fr>
@ -26,8 +26,6 @@
#include "periph_conf.h" #include "periph_conf.h"
#include "periph/init.h" #include "periph/init.h"
#if defined(CPU_FAM_STM32L0) || defined(CPU_FAM_STM32L1)
/* Check the source to be used for the PLL */ /* Check the source to be used for the PLL */
#if defined(CLOCK_HSI) && defined(CLOCK_HSE) #if defined(CLOCK_HSI) && defined(CLOCK_HSE)
#error "Only provide one of two CLOCK_HSI/CLOCK_HSE" #error "Only provide one of two CLOCK_HSI/CLOCK_HSE"
@ -115,5 +113,3 @@ void stmclk_init_sysclk(void)
/* Wait till PLL is used as system clock source */ /* Wait till PLL is used as system clock source */
while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != RCC_CFGR_SWS_PLL) {} while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != RCC_CFGR_SWS_PLL) {}
} }
#endif /* defined(CPU_FAM_STM32L0) || defined(CPU_FAM_STM32L1) */

5
cpu/stm32/stmclk_l4wb.c → cpu/stm32/stmclk/stmclk_l4wb.c
View File

@ -13,7 +13,7 @@
* @{ * @{
* *
* @file * @file
* @brief Implementation of STM32 clock configuration * @brief Implementation of STM32 clock configuration for L4 and WB families
* *
* @author Hauke Petersen <hauke.petersen@fu-berlin.de> * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Nick van IJzendoorn <nijzendoorn@engineering-spirit.nl> * @author Nick van IJzendoorn <nijzendoorn@engineering-spirit.nl>
@ -27,8 +27,6 @@
#include "stmclk.h" #include "stmclk.h"
#include "periph_conf.h" #include "periph_conf.h"
#if defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32WB)
/* make sure we have all needed information about the clock configuration */ /* make sure we have all needed information about the clock configuration */
#ifndef CLOCK_HSE #ifndef CLOCK_HSE
#error "Please provide CLOCK_HSE in your board's perhip_conf.h" #error "Please provide CLOCK_HSE in your board's perhip_conf.h"
@ -200,4 +198,3 @@ void stmclk_init_sysclk(void)
#endif /* CLOCK_LSE */ #endif /* CLOCK_LSE */
#endif /* MODULE_PERIPH_RTT */ #endif /* MODULE_PERIPH_RTT */
} }
#endif