rm rcc_enable

Author: burrbull

src/dma/mod.rs

@@ -17,10 +17,13 @@ use core::{
 };
 use embedded_dma::{StaticReadBuffer, StaticWriteBuffer};
 
+use crate::pac::RCC;
+use crate::rcc;
+
 pub mod traits;
 use traits::{
     sealed::{Bits, Sealed},
-    Channel, DMASet, Direction, Instance, PeriAddress, RccEnable, Stream, StreamISR,
+    Channel, DMASet, Direction, Instance, PeriAddress, Stream, StreamISR,
 };
 
 /// Errors.
@@ -202,6 +205,12 @@ pub struct StreamX<DMA, const S: u8> {
     _dma: PhantomData<DMA>,
 }
 
+impl<DMA, const S: u8> StreamX<DMA, S> {
+    fn new() -> Self {
+        Self { _dma: PhantomData }
+    }
+}
+
 /// Stream 0 on the DMA controller.
 pub type Stream0<DMA> = StreamX<DMA, 0>;
 /// Stream 1 on the DMA controller.
@@ -240,19 +249,24 @@ pub struct StreamsTuple<T>(
     pub StreamX<T, 7>,
 );
 
-impl<T: RccEnable> StreamsTuple<T> {
+impl<T: rcc::Enable + rcc::Reset> StreamsTuple<T> {
     /// Splits the DMA peripheral into streams.
-    pub fn new(regs: T) -> Self {
-        regs.rcc_enable();
+    pub fn new(_regs: T) -> Self {
+        unsafe {
+            //NOTE(unsafe) this reference will only be used for atomic writes with no side effects
+            let rcc = &(*RCC::ptr());
+            T::enable(rcc);
+            T::reset(rcc);
+        }
         Self(
-            StreamX { _dma: PhantomData },
-            StreamX { _dma: PhantomData },
-            StreamX { _dma: PhantomData },
-            StreamX { _dma: PhantomData },
-            StreamX { _dma: PhantomData },
-            StreamX { _dma: PhantomData },
-            StreamX { _dma: PhantomData },
-            StreamX { _dma: PhantomData },
+            StreamX::new(),
+            StreamX::new(),
+            StreamX::new(),
+            StreamX::new(),
+            StreamX::new(),
+            StreamX::new(),
+            StreamX::new(),
+            StreamX::new(),
         )
     }
 }

src/dma/traits.rs

@@ -1,8 +1,7 @@
 use super::*;
 use crate::{
     adc::Adc,
-    pac::{self, DMA1, DMA2, RCC},
-    rcc::{Enable, Reset},
+    pac::{self, DMA1, DMA2},
     serial::{Rx, Tx},
 };
 use core::ops::Deref;
@@ -261,34 +260,6 @@ impl Instance for DMA2 {
     }
 }
 
-/// Trait for peripheral's clock enabling.
-pub trait RccEnable: Sealed {
-    /// Enable the peripheral's clock in the RCC.
-    fn rcc_enable(&self);
-}
-
-impl RccEnable for DMA1 {
-    fn rcc_enable(&self) {
-        unsafe {
-            //NOTE(unsafe) this reference will only be used for atomic writes with no side effects
-            let rcc = &(*RCC::ptr());
-            DMA1::enable(rcc);
-            DMA1::reset(rcc);
-        }
-    }
-}
-
-impl RccEnable for DMA2 {
-    fn rcc_enable(&self) {
-        unsafe {
-            //NOTE(unsafe) this reference will only be used for atomic writes with no side effects
-            let rcc = &(*RCC::ptr());
-            DMA2::enable(rcc);
-            DMA2::reset(rcc);
-        }
-    }
-}
-
 macro_rules! tim_channels {
     ($($name:ident),+ $(,)*) => {
         $(