nrf/qdec: erase instance generics

1 files changed, 23 insertions, 16 deletions

diff --git a/embassy-nrf/src/qdec.rs b/embassy-nrf/src/qdec.rs
index 69bfab0bb..0ebd7afb8 100644
--- a/embassy-nrf/src/qdec.rs
+++ b/embassy-nrf/src/qdec.rs
@@ -16,8 +16,10 @@ use crate::pac::qdec::vals;
 use crate::{interrupt, pac};
 
 /// Quadrature decoder driver.
-pub struct Qdec<'d, T: Instance> {
-    _p: Peri<'d, T>,
+pub struct Qdec<'d> {
+    r: pac::qdec::Qdec,
+    state: &'static State,
+    _phantom: PhantomData<&'d ()>,
 }
 
 /// QDEC config
@@ -59,9 +61,9 @@ impl<T: Instance> interrupt::typelevel::Handler<T::Interrupt> for InterruptHandl
     }
 }
 
-impl<'d, T: Instance> Qdec<'d, T> {
+impl<'d> Qdec<'d> {
     /// Create a new QDEC.
-    pub fn new(
+    pub fn new<T: Instance>(
         qdec: Peri<'d, T>,
         _irq: impl interrupt::typelevel::Binding<T::Interrupt, InterruptHandler<T>> + 'd,
         a: Peri<'d, impl GpioPin>,
@@ -72,7 +74,7 @@ impl<'d, T: Instance> Qdec<'d, T> {
     }
 
     /// Create a new QDEC, with a pin for LED output.
-    pub fn new_with_led(
+    pub fn new_with_led<T: Instance>(
         qdec: Peri<'d, T>,
         _irq: impl interrupt::typelevel::Binding<T::Interrupt, InterruptHandler<T>> + 'd,
         a: Peri<'d, impl GpioPin>,
@@ -83,8 +85,8 @@ impl<'d, T: Instance> Qdec<'d, T> {
         Self::new_inner(qdec, a.into(), b.into(), Some(led.into()), config)
     }
 
-    fn new_inner(
-        p: Peri<'d, T>,
+    fn new_inner<T: Instance>(
+        _p: Peri<'d, T>,
         a: Peri<'d, AnyPin>,
         b: Peri<'d, AnyPin>,
         led: Option<Peri<'d, AnyPin>>,
@@ -147,7 +149,11 @@ impl<'d, T: Instance> Qdec<'d, T> {
         // Start sampling
         r.tasks_start().write_value(1);
 
-        Self { _p: p }
+        Self {
+            r: T::regs(),
+            state: T::state(),
+            _phantom: PhantomData,
+        }
     }
 
     /// Perform an asynchronous read of the decoder.
@@ -173,17 +179,18 @@ impl<'d, T: Instance> Qdec<'d, T> {
     /// # };
     /// ```
     pub async fn read(&mut self) -> i16 {
-        let t = T::regs();
-        t.intenset().write(|w| w.set_reportrdy(true));
-        t.tasks_readclracc().write_value(1);
+        self.r.intenset().write(|w| w.set_reportrdy(true));
+        self.r.tasks_readclracc().write_value(1);
 
-        poll_fn(|cx| {
-            T::state().waker.register(cx.waker());
-            if t.events_reportrdy().read() == 0 {
+        let state = self.state;
+        let r = self.r;
+        poll_fn(move |cx| {
+            state.waker.register(cx.waker());
+            if r.events_reportrdy().read() == 0 {
                 Poll::Pending
             } else {
-                t.events_reportrdy().write_value(0);
-                let acc = t.accread().read();
+                r.events_reportrdy().write_value(0);
+                let acc = r.accread().read();
                 Poll::Ready(acc as i16)
             }
         })