1 files changed, 1 insertions, 42 deletions

diff --git a/embassy-rp/src/critical_section_impl.rs b/embassy-rp/src/critical_section_impl.rs
index d233e6fab..2e4e8f716 100644
--- a/embassy-rp/src/critical_section_impl.rs
+++ b/embassy-rp/src/critical_section_impl.rs
@@ -1,6 +1,7 @@
 use core::sync::atomic::{AtomicU8, Ordering};
 
 use crate::pac;
+use crate::spinlock::Spinlock;
 
 struct RpSpinlockCs;
 critical_section::set_impl!(RpSpinlockCs);
@@ -92,46 +93,4 @@ impl RpSpinlockCs {
     }
 }
 
-pub struct Spinlock<const N: usize>(core::marker::PhantomData<()>)
-where
-    Spinlock<N>: SpinlockValid;
-
-impl<const N: usize> Spinlock<N>
-where
-    Spinlock<N>: SpinlockValid,
-{
-    /// Try to claim the spinlock. Will return `Some(Self)` if the lock is obtained, and `None` if the lock is
-    /// already in use somewhere else.
-    pub fn try_claim() -> Option<Self> {
-        let lock = pac::SIO.spinlock(N).read();
-        if lock > 0 {
-            Some(Self(core::marker::PhantomData))
-        } else {
-            None
-        }
-    }
-
-    /// Clear a locked spin-lock.
-    ///
-    /// # Safety
-    ///
-    /// Only call this function if you hold the spin-lock.
-    pub unsafe fn release() {
-        // Write (any value): release the lock
-        pac::SIO.spinlock(N).write_value(1);
-    }
-}
-
-impl<const N: usize> Drop for Spinlock<N>
-where
-    Spinlock<N>: SpinlockValid,
-{
-    fn drop(&mut self) {
-        // This is safe because we own the object, and hence hold the lock.
-        unsafe { Self::release() }
-    }
-}
-
 pub(crate) type Spinlock31 = Spinlock<31>;
-pub trait SpinlockValid {}
-impl SpinlockValid for Spinlock<31> {}