use bit banding

Author: xoviat

src/can.rs

@@ -18,17 +18,23 @@
 //! | TX       | PB13  |
 //! | RX       | PB12  |
 
+use crate::bb;
 use crate::gpio::{
     gpioa::{PA11, PA12},
     gpiob::{PB12, PB13, PB5, PB6, PB8, PB9},
     Alternate, AF9,
 };
-use crate::pac::CAN1;
-use crate::pac::CAN2;
+use crate::pac::{CAN1, CAN2};
 use crate::rcc::APB1;
 
 mod sealed {
     pub trait Sealed {}
+
+    /// Bus associated to peripheral
+    pub trait RccBus {
+        /// Bus type;
+        type Bus;
+    }
 }
 
 pub trait Pins: sealed::Sealed {
@@ -57,14 +63,42 @@ pins! {
     CAN2 => (PB6, PB5),
 }
 
+use sealed::RccBus;
+
+/// Enable/disable peripheral
+pub trait Enable: RccBus {
+    fn enable(apb: &mut Self::Bus);
+}
+
+macro_rules! bus {
+    ($($PER:ident => ($apbX:ty, $peren:literal),)+) => {
+        $(
+            impl RccBus for crate::pac::$PER {
+                type Bus = $apbX;
+            }
+            impl Enable for crate::pac::$PER {
+                #[inline(always)]
+                fn enable(apb: &mut Self::Bus) {
+                    unsafe { bb::set(apb.enr(), $peren) };
+                }
+            }
+        )+
+    }
+}
+
+bus! {
+    CAN1 => (APB1, 25),
+    CAN2 => (APB1, 26),
+}
+
 /// Interface to the CAN peripheral.
 pub struct Can<Instance> {
     _peripheral: Instance,
 }
 
 impl<Instance> Can<Instance>
 where
-    Instance: crate::rcc::Enable<Bus = APB1>,
+    Instance: Enable<Bus = APB1>,
 {
     /// Creates a CAN interaface.
     pub fn new<P>(can: Instance, _pins: P, apb: &mut APB1) -> Can<Instance>

src/rcc/mod.rs

@@ -1506,56 +1506,3 @@ impl Clocks {
         self.sai2_clk
     }
 }
-
-pub(crate) mod sealed {
-    /// Bus associated to peripheral
-    pub trait RccBus {
-        /// Bus type;
-        type Bus;
-    }
-}
-use sealed::RccBus;
-
-/// Enable/disable peripheral
-pub trait Enable: RccBus {
-    fn enable(apb: &mut Self::Bus);
-    fn disable(apb: &mut Self::Bus);
-}
-
-/// Reset peripheral
-pub trait Reset: RccBus {
-    fn reset(apb: &mut Self::Bus);
-}
-
-macro_rules! bus {
-    ($($PER:ident => ($apbX:ty, $peren:ident, $perrst:ident),)+) => {
-        $(
-            impl RccBus for crate::pac::$PER {
-                type Bus = $apbX;
-            }
-            impl Enable for crate::pac::$PER {
-                #[inline(always)]
-                fn enable(apb: &mut Self::Bus) {
-                    apb.enr().modify(|_, w| w.$peren().set_bit());
-                }
-                #[inline(always)]
-                fn disable(apb: &mut Self::Bus) {
-                    apb.enr().modify(|_, w| w.$peren().clear_bit());
-                }
-            }
-            impl Reset for crate::pac::$PER {
-                #[inline(always)]
-                fn reset(apb: &mut Self::Bus) {
-                    apb.rstr().modify(|_, w| w.$perrst().set_bit());
-                    apb.rstr().modify(|_, w| w.$perrst().clear_bit());
-                }
-            }
-        )+
-    }
-}
-
-#[cfg(feature = "has-can")]
-bus! {
-    CAN1 => (APB1, can1en, can1rst),
-    CAN2 => (APB1, can2en, can2rst),
-}