From 661b1f33738e56cd1b6092c0e3f014cb8e9726d3 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sat, 20 May 2023 10:10:21 -0500
Subject: [PATCH] stm32/ipcc: remove constrain

---
 embassy-stm32/src/ipcc.rs        | 15 ++++-----------
 embassy-stm32/src/tl_mbox/evt.rs |  5 +++--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/embassy-stm32/src/ipcc.rs b/embassy-stm32/src/ipcc.rs
index 9af5f171f..2b9caf8e5 100644
--- a/embassy-stm32/src/ipcc.rs
+++ b/embassy-stm32/src/ipcc.rs
@@ -35,6 +35,10 @@ pub struct Ipcc<'d> {
 
 impl<'d> Ipcc<'d> {
     pub fn new(peri: impl Peripheral<P = IPCC> + 'd, _config: Config) -> Self {
+        Self::new_inner(peri)
+    }
+
+    pub(crate) fn new_inner(peri: impl Peripheral<P = IPCC> + 'd) -> Self {
         into_ref!(peri);
 
         Self { _peri: peri }
@@ -180,14 +184,3 @@ unsafe fn _configure_pwr() {
     // set RF wake-up clock = LSE
     rcc.csr().modify(|w| w.set_rfwkpsel(0b01));
 }
-
-// TODO: if anyone has a better idea, please let me know
-/// extension trait that constrains the [`Ipcc`] peripheral
-pub trait IpccExt<'d> {
-    fn constrain(self) -> Ipcc<'d>;
-}
-impl<'d> IpccExt<'d> for IPCC {
-    fn constrain(self) -> Ipcc<'d> {
-        Ipcc { _peri: self.into_ref() }
-    }
-}
diff --git a/embassy-stm32/src/tl_mbox/evt.rs b/embassy-stm32/src/tl_mbox/evt.rs
index 0ecd4dab6..770133f29 100644
--- a/embassy-stm32/src/tl_mbox/evt.rs
+++ b/embassy-stm32/src/tl_mbox/evt.rs
@@ -131,8 +131,9 @@ impl EvtBox {
 
 impl Drop for EvtBox {
     fn drop(&mut self) {
-        use crate::ipcc::IpccExt;
-        let mut ipcc = unsafe { crate::Peripherals::steal() }.IPCC.constrain();
+        use crate::ipcc::Ipcc;
+
+        let mut ipcc = Ipcc::new_inner(unsafe { crate::Peripherals::steal() }.IPCC);
         mm::MemoryManager::evt_drop(self.ptr, &mut ipcc);
     }
 }