From 2eb0cc5df78b2abd38228ee1f07b7c446e17d362 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Tue, 4 Jan 2022 23:58:13 +0100
Subject: stm32/rcc: remove Rcc struct, RccExt trait.

All the RCC configuration is executed in init().
---
 examples/stm32l0/src/bin/button_exti.rs | 14 ++++++++------
 examples/stm32l0/src/bin/lorawan.rs     | 12 ++----------
 examples/stm32wl55/src/bin/lorawan.rs   | 13 +++----------
 examples/stm32wl55/src/bin/subghz.rs    |  5 -----
 4 files changed, 13 insertions(+), 31 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32l0/src/bin/button_exti.rs b/examples/stm32l0/src/bin/button_exti.rs
index 20d6f5555..88c75ce6d 100644
--- a/examples/stm32l0/src/bin/button_exti.rs
+++ b/examples/stm32l0/src/bin/button_exti.rs
@@ -8,16 +8,18 @@ mod example_common;
 use embassy::executor::Spawner;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Pull};
-use embassy_stm32::{rcc, Peripherals};
+use embassy_stm32::Peripherals;
 use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
 use example_common::*;
 
-#[embassy::main]
-async fn main(_spawner: Spawner, mut p: Peripherals) {
-    let mut rcc = rcc::Rcc::new(p.RCC);
-    // Enables SYSCFG
-    let _ = rcc.enable_hsi48(&mut p.SYSCFG, p.CRS);
+fn config() -> embassy_stm32::Config {
+    let mut config = embassy_stm32::Config::default();
+    config.rcc.enable_hsi48 = true;
+    config
+}
 
+#[embassy::main(config = "config()")]
+async fn main(_spawner: Spawner, p: Peripherals) {
     let button = Input::new(p.PB2, Pull::Up);
     let mut button = ExtiInput::new(button, p.EXTI2);
 
diff --git a/examples/stm32l0/src/bin/lorawan.rs b/examples/stm32l0/src/bin/lorawan.rs
index 7ce859a8d..df08ba18c 100644
--- a/examples/stm32l0/src/bin/lorawan.rs
+++ b/examples/stm32l0/src/bin/lorawan.rs
@@ -11,10 +11,8 @@ mod example_common;
 
 use embassy_lora::{sx127x::*, LoraTimer};
 use embassy_stm32::{
-    dbgmcu::Dbgmcu,
     exti::ExtiInput,
     gpio::{Input, Level, Output, Pull, Speed},
-    rcc,
     rng::Rng,
     spi,
     time::U32Ext,
@@ -26,18 +24,12 @@ use lorawan_encoding::default_crypto::DefaultFactory as Crypto;
 fn config() -> embassy_stm32::Config {
     let mut config = embassy_stm32::Config::default();
     config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16;
+    config.rcc.enable_hsi48 = true;
     config
 }
 
 #[embassy::main(config = "config()")]
-async fn main(_spawner: embassy::executor::Spawner, mut p: Peripherals) {
-    unsafe {
-        Dbgmcu::enable_all();
-    }
-
-    let mut rcc = rcc::Rcc::new(p.RCC);
-    let _ = rcc.enable_hsi48(&mut p.SYSCFG, p.CRS);
-
+async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) {
     // SPI for sx127x
     let spi = spi::Spi::new(
         p.SPI1,
diff --git a/examples/stm32wl55/src/bin/lorawan.rs b/examples/stm32wl55/src/bin/lorawan.rs
index 7048a5814..5d26dead2 100644
--- a/examples/stm32wl55/src/bin/lorawan.rs
+++ b/examples/stm32wl55/src/bin/lorawan.rs
@@ -10,10 +10,9 @@ mod example_common;
 
 use embassy_lora::{stm32wl::*, LoraTimer};
 use embassy_stm32::{
-    dbgmcu::Dbgmcu,
     dma::NoDma,
     gpio::{Level, Output, Pin, Speed},
-    interrupt, pac, rcc,
+    interrupt, pac,
     rng::Rng,
     subghz::*,
     Peripherals,
@@ -24,19 +23,13 @@ use lorawan_encoding::default_crypto::DefaultFactory as Crypto;
 fn config() -> embassy_stm32::Config {
     let mut config = embassy_stm32::Config::default();
     config.rcc.mux = embassy_stm32::rcc::ClockSrc::HSI16;
+    config.rcc.enable_lsi = true;
     config
 }
 
 #[embassy::main(config = "config()")]
 async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) {
-    unsafe {
-        Dbgmcu::enable_all();
-        let mut rcc = rcc::Rcc::new(p.RCC);
-        rcc.enable_lsi();
-        pac::RCC.ccipr().modify(|w| {
-            w.set_rngsel(0b01);
-        });
-    }
+    unsafe { pac::RCC.ccipr().modify(|w| w.set_rngsel(0b01)) }
 
     let ctrl1 = Output::new(p.PC3.degrade(), Level::High, Speed::High);
     let ctrl2 = Output::new(p.PC4.degrade(), Level::High, Speed::High);
diff --git a/examples/stm32wl55/src/bin/subghz.rs b/examples/stm32wl55/src/bin/subghz.rs
index a73c361c2..52fe6e9fa 100644
--- a/examples/stm32wl55/src/bin/subghz.rs
+++ b/examples/stm32wl55/src/bin/subghz.rs
@@ -11,7 +11,6 @@ mod example_common;
 use embassy::channel::signal::Signal;
 use embassy::interrupt::{Interrupt, InterruptExt};
 use embassy::traits::gpio::WaitForRisingEdge;
-use embassy_stm32::dbgmcu::Dbgmcu;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
@@ -72,10 +71,6 @@ fn config() -> embassy_stm32::Config {
 
 #[embassy::main(config = "config()")]
 async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) {
-    unsafe {
-        Dbgmcu::enable_all();
-    }
-
     let mut led1 = Output::new(p.PB15, Level::High, Speed::Low);
     let mut led2 = Output::new(p.PB9, Level::Low, Speed::Low);
     let mut led3 = Output::new(p.PB11, Level::Low, Speed::Low);
-- 
cgit