From 6c034c89815e8fb33471d35ed0afe449e34618b5 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Tue, 23 Aug 2016 22:13:33 +0000 Subject: [PATCH] stm32f4: rcc: fix compilation error missed in testing Fixes: 57c2b00a69f97205313e1c7ab8116ee1893b231e Running make for final sanity failed to catch this due to jobserver issues. *fumes* --- include/libopencm3/stm32/f4/rcc.h | 2 ++ lib/stm32/f4/rcc.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/libopencm3/stm32/f4/rcc.h b/include/libopencm3/stm32/f4/rcc.h index 4f22f226..c6bf5ad8 100644 --- a/include/libopencm3/stm32/f4/rcc.h +++ b/include/libopencm3/stm32/f4/rcc.h @@ -945,6 +945,8 @@ void rcc_css_enable(void); void rcc_css_disable(void); void rcc_osc_bypass_enable(enum rcc_osc osc); void rcc_osc_bypass_disable(enum rcc_osc osc); +void rcc_pllsai_config(uint16_t n, uint16_t p, uint16_t q, uint16_t r); +void rcc_pllsai_postscalers(uint8_t q, uint8_t r); void rcc_set_sysclk_source(uint32_t clk); void rcc_set_pll_source(uint32_t pllsrc); void rcc_set_ppre2(uint32_t ppre2); diff --git a/lib/stm32/f4/rcc.c b/lib/stm32/f4/rcc.c index 0b741a94..d4329ab7 100644 --- a/lib/stm32/f4/rcc.c +++ b/lib/stm32/f4/rcc.c @@ -591,7 +591,7 @@ void rcc_pllsai_config(uint16_t n, uint16_t p, uint16_t q, uint16_t r) */ void rcc_pllsai_postscalers(uint8_t q, uint8_t r) { - uint32 reg32 = RCC_DCKCFGR; + uint32_t reg32 = RCC_DCKCFGR; reg32 &= ((RCC_DCKCFGR_PLLSAIDIVR_MASK << RCC_DCKCFGR_PLLSAIDIVR_SHIFT) | (RCC_DCKCFGR_PLLSAIDIVQ_MASK << RCC_DCKCFGR_PLLSAIDIVQ_SHIFT)); RCC_DCKCFGR = reg32 | ((q << RCC_DCKCFGR_PLLSAIDIVQ_SHIFT) |