PeripheralRef: RMT

esp-rs · Dec 14, 2022 · ba1d4bd · ba1d4bd
1 parent 54e8eaf
commit ba1d4bd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/esp-hal-common/src/peripherals/esp32.rs b/esp-hal-common/src/peripherals/esp32.rs
@@ -64,5 +64,6 @@ mod peripherals {
         UART2,
         DPORT,
         LEDC,
+        RMT,
     }
 }
diff --git a/esp-hal-common/src/peripherals/esp32c3.rs b/esp-hal-common/src/peripherals/esp32c3.rs
@@ -56,5 +56,6 @@ mod peripherals {
         USB_DEVICE,
         SYSTEM,
         LEDC,
+        RMT,
     }
 }
diff --git a/esp-hal-common/src/peripherals/esp32s2.rs b/esp-hal-common/src/peripherals/esp32s2.rs
@@ -63,5 +63,6 @@ mod peripherals {
         UART1,
         SYSTEM,
         LEDC,
+        RMT,
     }
 }
diff --git a/esp-hal-common/src/peripherals/esp32s3.rs b/esp-hal-common/src/peripherals/esp32s3.rs
@@ -75,5 +75,6 @@ mod peripherals {
         USB_DEVICE,
         SYSTEM,
         LEDC,
+        RMT,
     }
 }
diff --git a/esp-hal-common/src/pulse_control.rs b/esp-hal-common/src/pulse_control.rs
@@ -85,7 +85,8 @@ pub use paste::paste;
 
 use crate::{
     gpio::{types::OutputSignal, OutputPin},
-    pac::RMT,
+    peripherals::RMT,
+    peripheral::{Peripheral, PeripheralRef},
     system::PeripheralClockControl,
 };
 
@@ -822,27 +823,28 @@ macro_rules! rmt {
     )
  => {
     /// RMT peripheral (RMT)
-    pub struct PulseControl {
+    pub struct PulseControl<'d> {
         /// The underlying register block
-        reg: RMT,
+        reg: PeripheralRef<'d, RMT>,
         $(
             /// RMT channel $cxi
             pub $obj_name: $cxi,
         )+
     }
 
-    impl PulseControl {
+    impl<'d> PulseControl<'d> {
         /// Create a new pulse controller instance
         #[cfg(any(esp32c3, esp32s3))]
         pub fn new(
-            instance: RMT,
+            instance: impl Peripheral<P = RMT> + 'd,
             peripheral_clock_control: &mut PeripheralClockControl,
             clk_source: ClockSource,
             div_abs: u8,
             div_frac_a: u8,
             div_frac_b: u8,
         ) -> Result<Self, SetupError> {
 
+            crate::into_ref!(instance);
             let pc = PulseControl {
                 reg: instance,
                 $(
@@ -859,10 +861,11 @@ macro_rules! rmt {
         /// Create a new pulse controller instance
         #[cfg(any(esp32, esp32s2))]
         pub fn new(
-            instance: RMT,
+            instance: impl Peripheral<P = RMT> + 'd,
             peripheral_clock_control: &mut PeripheralClockControl,
         ) -> Result<Self, SetupError> {
 
+            crate::into_ref!(instance);
             let pc = PulseControl {
                 reg: instance,
                 $(
@@ -876,11 +879,6 @@ macro_rules! rmt {
             Ok(pc)
         }
 
-        /// Return the raw interface to the underlying RMT peripheral
-        pub fn free(self) -> RMT {
-            self.reg
-        }
-
         // Enable the RMT peripherals clock in the system peripheral
         fn enable_peripheral(&self, peripheral_clock_control: &mut PeripheralClockControl) {
             peripheral_clock_control.enable(crate::system::Peripheral::Rmt);