Implement WaitCell per ADC instance

Signed-off-by: Mathis Deroo <[email protected]>

1 files changed, 8 insertions, 4 deletions

diff --git a/embassy-mcxa/src/adc.rs b/embassy-mcxa/src/adc.rs
index c2ea06e89..94d945c88 100644
--- a/embassy-mcxa/src/adc.rs
+++ b/embassy-mcxa/src/adc.rs
@@ -18,8 +18,6 @@ use crate::pac::adc1::cmdl1::{Adch, Ctype, Mode};
 use crate::pac::adc1::ctrl::CalAvgs;
 use crate::pac::adc1::tctrl::{Tcmd, Tpri};
 
-/// Global wait cell for alarm notifications
-static WAKER: WaitCell = WaitCell::new();
 
 const G_LPADC_RESULT_SHIFT: u32 = 0;
 
@@ -532,7 +530,7 @@ impl<'a, I: Instance> Adc<'a, I> {
     /// # Returns
     /// 16-bit ADC conversion value
     pub async fn read(&mut self) -> u16 {
-        let wait = WAKER.subscribe().await;
+        let wait = I::wait_cell().subscribe().await;
 
         self.enable_interrupt(0x1);
         self.do_software_trigger(1);
@@ -547,7 +545,7 @@ impl<'a, I: Instance> Adc<'a, I> {
 impl<T: Instance> Handler<T::Interrupt> for InterruptHandler<T> {
     unsafe fn on_interrupt() {
         T::ptr().ie().modify(|r, w| w.bits(r.bits() & !0x1));
-        WAKER.wake();
+        T::wait_cell().wake();
     }
 }
 
@@ -560,6 +558,7 @@ impl<I: GpioPin> sealed::Sealed for I {}
 
 trait SealedInstance {
     fn ptr() -> &'static pac::adc0::RegisterBlock;
+    fn wait_cell() -> &'static WaitCell;
 }
 
 /// ADC Instance
@@ -578,6 +577,11 @@ macro_rules! impl_instance {
                         unsafe { &*pac::[<Adc $n>]::ptr() }
                     }
 
+                    fn wait_cell() -> &'static WaitCell {
+                        static WAIT_CELL: WaitCell = WaitCell::new();
+                        &WAIT_CELL
+                    }
+
                 }
 
                 impl Instance for crate::peripherals::[<ADC $n>] {