From 4695b47da68a5b2f75270bea21e15b8f1b9fd6ff Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Mon, 25 Jul 2016 15:18:40 +0200 Subject: Switch to CMSIS --- ucoo/arch/arch.stm32f4.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'ucoo/arch/arch.stm32f4.cc') diff --git a/ucoo/arch/arch.stm32f4.cc b/ucoo/arch/arch.stm32f4.cc index 74c7306..c569c65 100644 --- a/ucoo/arch/arch.stm32f4.cc +++ b/ucoo/arch/arch.stm32f4.cc @@ -22,18 +22,22 @@ // // }}} #include "ucoo/arch/arch.hh" -#include "ucoo/common.hh" - -#include +#include "ucoo/arch/rcc.stm32.hh" namespace ucoo { void arch_init (int argc, const char **argv) { - rcc_clock_setup_hse_3v3 (&hse_8mhz_3v3[CLOCK_3V3_120MHZ]); - rcc_ahb_frequency = 120000000; - rcc_periph_clock_enable (RCC_SYSCFG); + rcc_sys_clock_setup_pll (120000000, 8000000, + 4, // pllm => 8 MHz / 4 = 2 MHz + 120, // plln => 2 MHz * 120 = 240 MHz + 2, // pllp => 240 MHz / 2 = 120 MHz + 5, // pllq => 240 MHz / 5 = 48 MHz + 4, // apb1_pre => 30 MHz + 2, // apb2_pre => 60 MHz + SupplyRange::V2_7); + rcc_peripheral_clock_enable (Rcc::SYSCFG); } } // namespace ucoo -- cgit v1.2.3