Refactor integrated-timers

1 files changed, 25 insertions, 105 deletions

diff --git a/embassy-rp/src/time_driver.rs b/embassy-rp/src/time_driver.rs
index 40fc71bb1..17ae5fff3 100644
--- a/embassy-rp/src/time_driver.rs
+++ b/embassy-rp/src/time_driver.rs
@@ -1,11 +1,10 @@
 //! Timer driver.
 use core::cell::Cell;
 
-use atomic_polyfill::{AtomicU8, Ordering};
-use critical_section::CriticalSection;
 use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
 use embassy_sync::blocking_mutex::Mutex;
-use embassy_time_driver::{AlarmHandle, Driver};
+use embassy_time_driver::Driver;
+use embassy_time_queue_driver::GlobalTimerQueue;
 #[cfg(feature = "rp2040")]
 use pac::TIMER;
 #[cfg(feature = "_rp235x")]
@@ -16,23 +15,17 @@ use crate::{interrupt, pac};
 
 struct AlarmState {
     timestamp: Cell<u64>,
-    callback: Cell<Option<(fn(*mut ()), *mut ())>>,
 }
 unsafe impl Send for AlarmState {}
 
-const ALARM_COUNT: usize = 4;
-
 struct TimerDriver {
-    alarms: Mutex<CriticalSectionRawMutex, [AlarmState; ALARM_COUNT]>,
-    next_alarm: AtomicU8,
+    alarms: Mutex<CriticalSectionRawMutex, AlarmState>,
 }
 
 embassy_time_driver::time_driver_impl!(static DRIVER: TimerDriver = TimerDriver{
-    alarms:  Mutex::const_new(CriticalSectionRawMutex::new(), [const{AlarmState {
+    alarms:  Mutex::const_new(CriticalSectionRawMutex::new(), AlarmState {
         timestamp: Cell::new(0),
-        callback: Cell::new(None),
-    }}; ALARM_COUNT]),
-    next_alarm: AtomicU8::new(0),
+    }),
 });
 
 impl Driver for TimerDriver {
@@ -46,34 +39,13 @@ impl Driver for TimerDriver {
             }
         }
     }
+}
 
-    unsafe fn allocate_alarm(&self) -> Option<AlarmHandle> {
-        let id = self.next_alarm.fetch_update(Ordering::AcqRel, Ordering::Acquire, |x| {
-            if x < ALARM_COUNT as u8 {
-                Some(x + 1)
-            } else {
-                None
-            }
-        });
-
-        match id {
-            Ok(id) => Some(AlarmHandle::new(id)),
-            Err(_) => None,
-        }
-    }
-
-    fn set_alarm_callback(&self, alarm: AlarmHandle, callback: fn(*mut ()), ctx: *mut ()) {
-        let n = alarm.id() as usize;
-        critical_section::with(|cs| {
-            let alarm = &self.alarms.borrow(cs)[n];
-            alarm.callback.set(Some((callback, ctx)));
-        })
-    }
-
-    fn set_alarm(&self, alarm: AlarmHandle, timestamp: u64) -> bool {
-        let n = alarm.id() as usize;
+impl TimerDriver {
+    fn set_alarm(&self, timestamp: u64) -> bool {
+        let n = 0;
         critical_section::with(|cs| {
-            let alarm = &self.alarms.borrow(cs)[n];
+            let alarm = &self.alarms.borrow(cs);
             alarm.timestamp.set(timestamp);
 
             // Arm it.
@@ -96,15 +68,14 @@ impl Driver for TimerDriver {
             }
         })
     }
-}
 
-impl TimerDriver {
-    fn check_alarm(&self, n: usize) {
+    fn check_alarm(&self) {
+        let n = 0;
         critical_section::with(|cs| {
-            let alarm = &self.alarms.borrow(cs)[n];
+            let alarm = &self.alarms.borrow(cs);
             let timestamp = alarm.timestamp.get();
             if timestamp <= self.now() {
-                self.trigger_alarm(n, cs)
+                self.trigger_alarm()
             } else {
                 // Not elapsed, arm it again.
                 // This can happen if it was set more than 2^32 us in the future.
@@ -116,17 +87,8 @@ impl TimerDriver {
         TIMER.intr().write(|w| w.set_alarm(n, true));
     }
 
-    fn trigger_alarm(&self, n: usize, cs: CriticalSection) {
-        // disarm
-        TIMER.armed().write(|w| w.set_armed(1 << n));
-
-        let alarm = &self.alarms.borrow(cs)[n];
-        alarm.timestamp.set(u64::MAX);
-
-        // Call after clearing alarm, so the callback can set another alarm.
-        if let Some((f, ctx)) = alarm.callback.get() {
-            f(ctx);
-        }
+    fn trigger_alarm(&self) {
+        TIMER_QUEUE_DRIVER.dispatch();
     }
 }
 
@@ -134,79 +96,37 @@ impl TimerDriver {
 pub unsafe fn init() {
     // init alarms
     critical_section::with(|cs| {
-        let alarms = DRIVER.alarms.borrow(cs);
-        for a in alarms {
-            a.timestamp.set(u64::MAX);
-        }
+        let alarm = DRIVER.alarms.borrow(cs);
+        alarm.timestamp.set(u64::MAX);
     });
 
-    // enable all irqs
+    // enable irq
     TIMER.inte().write(|w| {
         w.set_alarm(0, true);
-        w.set_alarm(1, true);
-        w.set_alarm(2, true);
-        w.set_alarm(3, true);
     });
     #[cfg(feature = "rp2040")]
     {
         interrupt::TIMER_IRQ_0.enable();
-        interrupt::TIMER_IRQ_1.enable();
-        interrupt::TIMER_IRQ_2.enable();
-        interrupt::TIMER_IRQ_3.enable();
     }
     #[cfg(feature = "_rp235x")]
     {
         interrupt::TIMER0_IRQ_0.enable();
-        interrupt::TIMER0_IRQ_1.enable();
-        interrupt::TIMER0_IRQ_2.enable();
-        interrupt::TIMER0_IRQ_3.enable();
     }
 }
 
 #[cfg(all(feature = "rt", feature = "rp2040"))]
 #[interrupt]
 fn TIMER_IRQ_0() {
-    DRIVER.check_alarm(0)
-}
-
-#[cfg(all(feature = "rt", feature = "rp2040"))]
-#[interrupt]
-fn TIMER_IRQ_1() {
-    DRIVER.check_alarm(1)
-}
-
-#[cfg(all(feature = "rt", feature = "rp2040"))]
-#[interrupt]
-fn TIMER_IRQ_2() {
-    DRIVER.check_alarm(2)
-}
-
-#[cfg(all(feature = "rt", feature = "rp2040"))]
-#[interrupt]
-fn TIMER_IRQ_3() {
-    DRIVER.check_alarm(3)
+    DRIVER.check_alarm()
 }
 
 #[cfg(all(feature = "rt", feature = "_rp235x"))]
 #[interrupt]
 fn TIMER0_IRQ_0() {
-    DRIVER.check_alarm(0)
+    DRIVER.check_alarm()
 }
 
-#[cfg(all(feature = "rt", feature = "_rp235x"))]
-#[interrupt]
-fn TIMER0_IRQ_1() {
-    DRIVER.check_alarm(1)
-}
-
-#[cfg(all(feature = "rt", feature = "_rp235x"))]
-#[interrupt]
-fn TIMER0_IRQ_2() {
-    DRIVER.check_alarm(2)
-}
-
-#[cfg(all(feature = "rt", feature = "_rp235x"))]
-#[interrupt]
-fn TIMER0_IRQ_3() {
-    DRIVER.check_alarm(3)
-}
+embassy_time_queue_driver::timer_queue_impl!(
+    static TIMER_QUEUE_DRIVER: GlobalTimerQueue
+        = GlobalTimerQueue::new(|next_expiration| DRIVER.set_alarm(next_expiration))
+);