From 74cb84eb4e4be75859deb6fa4896efae5345eacb Mon Sep 17 00:00:00 2001
From: Michael Medin <michael@medin.name>
Date: Mon, 28 Apr 2025 09:14:56 +0200
Subject: [PATCH] Moved functions to rcc module (this is a bit awkward as we
 now have two init functions in rcc: `rcc::init`and `rcc::init_rcc`)

---
 embassy-stm32/src/lib.rs     | 32 +-------------------------------
 embassy-stm32/src/rcc/mod.rs | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs
index 444d14f28..3e84d3386 100644
--- a/embassy-stm32/src/lib.rs
+++ b/embassy-stm32/src/lib.rs
@@ -213,7 +213,6 @@ macro_rules! bind_interrupts {
 
 // Reexports
 pub use _generated::{peripherals, Peripherals};
-use critical_section::CriticalSection;
 pub use embassy_hal_internal::{Peri, PeripheralType};
 #[cfg(feature = "unstable-pac")]
 pub use stm32_metapac as pac;
@@ -601,38 +600,9 @@ fn init_hw(config: Config) -> Peripherals {
             #[cfg(feature = "exti")]
             exti::init(cs);
 
-            init_rcc(cs, config.rcc);
+            rcc::init_rcc(cs, config.rcc);
         }
 
         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;
-        }
-    }
-}
diff --git a/embassy-stm32/src/rcc/mod.rs b/embassy-stm32/src/rcc/mod.rs
index 4f43d3748..cf88cfad6 100644
--- a/embassy-stm32/src/rcc/mod.rs
+++ b/embassy-stm32/src/rcc/mod.rs
@@ -34,6 +34,7 @@ pub use _version::*;
 use stm32_metapac::RCC;
 
 pub use crate::_generated::{mux, Clocks};
+use crate::rcc;
 use crate::time::Hertz;
 
 #[cfg(feature = "low-power")]
@@ -369,3 +370,32 @@ pub fn enable_and_reset<T: RccPeripheral>() {
 pub fn disable<T: RccPeripheral>() {
     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;
+        }
+    }
+}