Remove ClocksExt

Author: hannobraun

nrf52-hal-common/src/clocks.rs

@@ -20,11 +20,6 @@ pub struct LfOscStarted;
 /// Low Frequency Clock Stopped
 pub struct LfOscStopped;
 
-/// Extension trait for the CLOCK peripheral
-pub trait ClocksExt {
-    fn constrain(self) -> Clocks<Internal, Internal, LfOscStopped>;
-}
-
 /// High Frequency Clock Frequency (in Hz)
 pub const HFCLK_FREQ: u32 = 64_000_000;
 /// Low Frequency Clock Frequency (in Hz)
@@ -39,6 +34,14 @@ pub struct Clocks<H, L, LSTAT> {
 }
 
 impl<H, L, LSTAT> Clocks<H, L, LSTAT> {
+    pub fn new(clock: CLOCK) -> Clocks<Internal, Internal, LfOscStopped> {
+        Clocks {
+            hfclk: Internal,
+            lfclk: Internal,
+            lfstat: LfOscStopped,
+            periph: clock,
+        }
+    }
     /// Use an external oscillator as the high frequency clock source
     pub fn enable_ext_hfosc(self) -> Clocks<ExternalOscillator, L, LSTAT> {
         self.periph.tasks_hfclkstart.write(|w| unsafe { w.bits(1) });
@@ -157,14 +160,3 @@ impl<H, L> Clocks<H, L, LfOscStopped> {
         }
     }
 }
-
-impl ClocksExt for CLOCK {
-    fn constrain(self) -> Clocks<Internal, Internal, LfOscStopped> {
-        Clocks {
-            hfclk: Internal,
-            lfclk: Internal,
-            lfstat: LfOscStopped,
-            periph: self,
-        }
-    }
-}

nrf52-hal-common/src/lib.rs

@@ -27,7 +27,6 @@ pub mod uarte;
 pub mod prelude {
     pub use crate::hal::prelude::*;
 
-    pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
     pub use crate::time::U32Ext;
 }

nrf52810-hal/src/lib.rs

@@ -8,7 +8,6 @@ pub mod prelude {
     pub use crate::hal::prelude::*;
     pub use nrf52_hal_common::prelude::*;
 
-    pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
     pub use crate::time::U32Ext;
 }

nrf52840-hal/src/lib.rs

@@ -8,7 +8,6 @@ pub mod prelude {
     pub use crate::hal::prelude::*;
     pub use nrf52_hal_common::prelude::*;
 
-    pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
     pub use crate::time::U32Ext;
 }