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

Merge pull request #11897 from fjmolinas/pr_stm32_common_define_alignment

Browse Source 
cpu/stm32_common: uniformize define alignments
This commit is contained in:
Alexandre Abadie 2019-08-05 11:27:36 +02:00 committed by GitHub
commit f4d65e10cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cpu/stm32_common/cpu_common.c
View File

@ -91,13 +91,13 @@ void periph_clk_en(bus_t bus, uint32_t mask)
case IOP: case IOP:
RCC->IOPENR |= mask; RCC->IOPENR |= mask;
break; break;
#elif defined(CPU_FAM_STM32L1) || defined(CPU_FAM_STM32F1) \ #elif defined(CPU_FAM_STM32L1) || defined(CPU_FAM_STM32F1) || \
|| defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F3) defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F3)
case AHB: case AHB:
RCC->AHBENR |= mask; RCC->AHBENR |= mask;
break; break;
#elif defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) \ #elif defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) || \
|| defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32F7) defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32F7)
case AHB1: case AHB1:
RCC->AHB1ENR |= mask; RCC->AHB1ENR |= mask;
break; break;
@ -144,13 +144,13 @@ void periph_clk_dis(bus_t bus, uint32_t mask)
case IOP: case IOP:
RCC->IOPENR &= ~(mask); RCC->IOPENR &= ~(mask);
break; break;
#elif defined(CPU_FAM_STM32L1) || defined(CPU_FAM_STM32F1) \ #elif defined(CPU_FAM_STM32L1) || defined(CPU_FAM_STM32F1) || \
|| defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F3) defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F3)
case AHB: case AHB:
RCC->AHBENR &= ~(mask); RCC->AHBENR &= ~(mask);
break; break;
#elif defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) \ #elif defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) || \
|| defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32F7) defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32F7)
case AHB1: case AHB1:
RCC->AHB1ENR &= ~(mask); RCC->AHB1ENR &= ~(mask);
break; break;

12
cpu/stm32_common/periph/uart.c
View File

@ -34,9 +34,9 @@
#include "periph/gpio.h" #include "periph/gpio.h"
#include "pm_layered.h" #include "pm_layered.h"
#if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32L0) \ #if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32L0) || \
|| defined(CPU_FAM_STM32F3) || defined(CPU_FAM_STM32L4) \ defined(CPU_FAM_STM32F3) || defined(CPU_FAM_STM32L4) || \
|| defined(CPU_FAM_STM32F7) defined(CPU_FAM_STM32F7)
#define ISR_REG ISR #define ISR_REG ISR
#define ISR_TXE USART_ISR_TXE #define ISR_TXE USART_ISR_TXE
#define ISR_TC USART_ISR_TC #define ISR_TC USART_ISR_TC
@ -368,9 +368,9 @@ void uart_poweroff(uart_t uart)
static inline void irq_handler(uart_t uart) static inline void irq_handler(uart_t uart)
{ {
#if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32L0) \ #if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32L0) || \
|| defined(CPU_FAM_STM32F3) || defined(CPU_FAM_STM32L4) \ defined(CPU_FAM_STM32F3) || defined(CPU_FAM_STM32L4) || \
|| defined(CPU_FAM_STM32F7) defined(CPU_FAM_STM32F7)
uint32_t status = dev(uart)->ISR; uint32_t status = dev(uart)->ISR;

20
cpu/stm32_common/stmclk.c
View File

@ -19,8 +19,9 @@
* @} * @}
*/ */
#if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || defined(CPU_FAM_STM32F2) \ #if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || \
|| defined(CPU_FAM_STM32F3) || defined(CPU_FAM_STM32F4) || defined(CPU_FAM_STM32F7) 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"
@ -41,7 +42,8 @@
* @name PLL configuration * @name PLL configuration
* @{ * @{
*/ */
#if defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) || defined(CPU_FAM_STM32F7) #if defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) || \
defined(CPU_FAM_STM32F7)
/* figure out which input to use */ /* figure out which input to use */
#if (CLOCK_HSE) #if (CLOCK_HSE)
#define PLL_SRC RCC_PLLCFGR_PLLSRC_HSE #define PLL_SRC RCC_PLLCFGR_PLLSRC_HSE
@ -147,7 +149,8 @@
* @name Deduct the needed flash wait states from the core clock frequency * @name Deduct the needed flash wait states from the core clock frequency
* @{ * @{
*/ */
#if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || defined(STM32F3) #if defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || \
defined(CPU_FAM_STM32F3)
#define FLASH_WAITSTATES ((CLOCK_CORECLOCK - 1) / 24000000U) #define FLASH_WAITSTATES ((CLOCK_CORECLOCK - 1) / 24000000U)
#else #else
#define FLASH_WAITSTATES (CLOCK_CORECLOCK / 30000000U) #define FLASH_WAITSTATES (CLOCK_CORECLOCK / 30000000U)
@ -158,7 +161,8 @@
#define FLASH_ACR_CONFIG (FLASH_ACR_ICEN | FLASH_ACR_DCEN | FLASH_ACR_PRFTEN | FLASH_WAITSTATES) #define FLASH_ACR_CONFIG (FLASH_ACR_ICEN | FLASH_ACR_DCEN | FLASH_ACR_PRFTEN | FLASH_WAITSTATES)
#elif defined(CPU_FAM_STM32F7) #elif defined(CPU_FAM_STM32F7)
#define FLASH_ACR_CONFIG (FLASH_ACR_ARTEN | FLASH_ACR_PRFTEN | FLASH_WAITSTATES) #define FLASH_ACR_CONFIG (FLASH_ACR_ARTEN | FLASH_ACR_PRFTEN | FLASH_WAITSTATES)
#elif defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || defined(CPU_FAM_STM32F3) #elif defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || \
defined(CPU_FAM_STM32F3)
#define FLASH_ACR_CONFIG (FLASH_ACR_PRFTBE | FLASH_WAITSTATES) #define FLASH_ACR_CONFIG (FLASH_ACR_PRFTBE | FLASH_WAITSTATES)
#endif #endif
/** @} */ /** @} */
@ -208,9 +212,11 @@ void stmclk_init_sysclk(void)
RCC->DCKCFGR2 |= RCC_DCKCFGR2_CK48MSEL; RCC->DCKCFGR2 |= RCC_DCKCFGR2_CK48MSEL;
#endif #endif
/* now we can safely configure and start the PLL */ /* now we can safely configure and start the PLL */
#if defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) || defined(CPU_FAM_STM32F7) #if defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) || \
defined(CPU_FAM_STM32F7)
RCC->PLLCFGR = (PLL_SRC | PLL_M | PLL_N | PLL_P | PLL_Q | PLL_R); RCC->PLLCFGR = (PLL_SRC | PLL_M | PLL_N | PLL_P | PLL_Q | PLL_R);
#elif defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || defined(CPU_FAM_STM32F3) #elif defined(CPU_FAM_STM32F0) || defined(CPU_FAM_STM32F1) || \
defined(CPU_FAM_STM32F3)
/* reset PLL configuration bits */ /* reset PLL configuration bits */
RCC->CFGR &= ~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLMUL); RCC->CFGR &= ~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLMUL);
/* set PLL configuration */ /* set PLL configuration */