itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-10-02 22:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved functions to rcc module (this is a bit awkward as we now have two init functions in rcc: rcc::initand rcc::init_rcc)

Browse Source
This commit is contained in:
Michael Medin 2025-04-28 09:14:56 +02:00
parent 584066e209
commit 74cb84eb4e
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
embassy-stm32/src/lib.rs
View File

@ -213,7 +213,6 @@ macro_rules! bind_interrupts {
// Reexports // Reexports
pub use _generated::{peripherals, Peripherals}; pub use _generated::{peripherals, Peripherals};
use critical_section::CriticalSection;
pub use embassy_hal_internal::{Peri, PeripheralType}; pub use embassy_hal_internal::{Peri, PeripheralType};
#[cfg(feature = "unstable-pac")] #[cfg(feature = "unstable-pac")]
pub use stm32_metapac as pac; pub use stm32_metapac as pac;
@ -601,38 +600,9 @@ fn init_hw(config: Config) -> Peripherals {
#[cfg(feature = "exti")] #[cfg(feature = "exti")]
exti::init(cs); exti::init(cs);
init_rcc(cs, config.rcc); rcc::init_rcc(cs, config.rcc);
} }
p p
}) })
} }
/// Re-initialize the `embassy-stm32` clock configuration with the provided configuration.
///
/// This is useful when you need to alter the CPU clock after configuring peripherals.
/// For instance, configure an external clock via spi or i2c.
///
/// Please not this only re-configures the rcc and the time driver (not GPIO, EXTI, etc).
///
/// This should only be called after `init`.
#[cfg(not(feature = "_dual-core"))]
pub fn reinit(config: rcc::Config) {
critical_section::with(|cs| init_rcc(cs, config))
}
fn init_rcc(_cs: CriticalSection, config: rcc::Config) {
unsafe {
rcc::init(config);
// must be after rcc init
#[cfg(feature = "_time-driver")]
time_driver::init(_cs);
#[cfg(feature = "low-power")]
{
crate::rcc::REFCOUNT_STOP2 = 0;
crate::rcc::REFCOUNT_STOP1 = 0;
}
}
}

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

@ -34,6 +34,7 @@ pub use _version::*;
use stm32_metapac::RCC; use stm32_metapac::RCC;
pub use crate::_generated::{mux, Clocks}; pub use crate::_generated::{mux, Clocks};
use crate::rcc;
use crate::time::Hertz; use crate::time::Hertz;
#[cfg(feature = "low-power")] #[cfg(feature = "low-power")]
@ -369,3 +370,32 @@ pub fn enable_and_reset<T: RccPeripheral>() {
pub fn disable<T: RccPeripheral>() { pub fn disable<T: RccPeripheral>() {
T::RCC_INFO.disable(); T::RCC_INFO.disable();
} }
/// Re-initialize the `embassy-stm32` clock configuration with the provided configuration.
///
/// This is useful when you need to alter the CPU clock after configuring peripherals.
/// For instance, configure an external clock via spi or i2c.
///
/// Please not this only re-configures the rcc and the time driver (not GPIO, EXTI, etc).
///
/// This should only be called after `init`.
#[cfg(not(feature = "_dual-core"))]
pub fn reinit(config: Config) {
critical_section::with(|cs| init_rcc(cs, config))
}
fn init_rcc(_cs: CriticalSection, config: Config) {
unsafe {
init(config);
// must be after rcc init
#[cfg(feature = "_time-driver")]
crate::time_driver::init(_cs);
#[cfg(feature = "low-power")]
{
REFCOUNT_STOP2 = 0;
REFCOUNT_STOP1 = 0;
}
}
}