max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assume tim2 in macro and remove clock setup in chip specific rcc init

Browse Source 
Add temporary start_tim2() fn to Clock to assist macro in starting
embassy clock
This commit is contained in:
Ulf Lilleengen
2021-05-26 21:42:07 +02:00
parent aaab7d87a5
commit bfa999a2e0
6 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
embassy-stm32/src/rcc/h7/mod.rs
View File

@ -529,5 +529,4 @@ impl<'d> Rcc<'d> {
}
// TODO
pub type SystemClock = ();
pub unsafe fn init(_config: Config) -> SystemClock {}
pub unsafe fn init(_config: Config) {}

19
embassy-stm32/src/rcc/l0/mod.rs
View File

@ -1,4 +1,5 @@
use crate::clock::Clock;
use crate::clock::{set_freqs, ClockFreqs};
use crate::interrupt;
use crate::pac;
use crate::pac::peripherals::{self, RCC, TIM2};
@ -585,10 +586,7 @@ pub struct MCOEnabled(());
#[derive(Clone, Copy)]
pub struct LSE(());
// We use TIM2 as SystemClock
pub type SystemClock = Clock<TIM2>;
pub unsafe fn init(config: Config) -> SystemClock {
pub unsafe fn init(config: Config) {
let rcc = pac::RCC;
let enabled = vals::Iophen::ENABLED;
rcc.iopenr().write(|w| {
@ -602,14 +600,7 @@ pub unsafe fn init(config: Config) -> SystemClock {
let mut r = <peripherals::RCC as embassy::util::Steal>::steal();
let clocks = r.freeze(config);
rcc.apb1enr().modify(|w| w.set_tim2en(Lptimen::ENABLED));
rcc.apb1rstr().modify(|w| w.set_tim2rst(true));
rcc.apb1rstr().modify(|w| w.set_tim2rst(false));
Clock::new(
<peripherals::TIM2 as embassy::util::Steal>::steal(),
interrupt::take!(TIM2),
clocks.apb1_clk(),
)
set_freqs(ClockFreqs {
tim2: clocks.apb1_clk(),
});
}

1
embassy-stm32/src/rcc/mod.rs
View File

@ -6,7 +6,6 @@ cfg_if::cfg_if! {
mod l0;
pub use l0::*;
} else {
pub type SystemClock = ();
#[derive(Default)]
pub struct Config {}
pub unsafe fn init(_config: Config) -> SystemClock {