Initial rp235x support

Examples have been run, but there is not yet a test suite.

1 files changed, 56 insertions, 17 deletions

diff --git a/embassy-rp/src/time_driver.rs b/embassy-rp/src/time_driver.rs
index bab1044cb..6f532fa8e 100644
--- a/embassy-rp/src/time_driver.rs
+++ b/embassy-rp/src/time_driver.rs
@@ -10,6 +10,11 @@ use embassy_time_driver::{AlarmHandle, Driver};
 use crate::interrupt::InterruptExt;
 use crate::{interrupt, pac};
 
+#[cfg(feature = "rp2040")]
+use pac::TIMER;
+#[cfg(feature = "rp235x")]
+use pac::TIMER0 as TIMER;
+
 struct AlarmState {
     timestamp: Cell<u64>,
     callback: Cell<Option<(fn(*mut ()), *mut ())>>,
@@ -35,9 +40,9 @@ embassy_time_driver::time_driver_impl!(static DRIVER: TimerDriver = TimerDriver{
 impl Driver for TimerDriver {
     fn now(&self) -> u64 {
         loop {
-            let hi = pac::TIMER.timerawh().read();
-            let lo = pac::TIMER.timerawl().read();
-            let hi2 = pac::TIMER.timerawh().read();
+            let hi = TIMER.timerawh().read();
+            let lo = TIMER.timerawl().read();
+            let hi2 = TIMER.timerawh().read();
             if hi == hi2 {
                 return (hi as u64) << 32 | (lo as u64);
             }
@@ -77,13 +82,13 @@ impl Driver for TimerDriver {
             // Note that we're not checking the high bits at all. This means the irq may fire early
             // if the alarm is more than 72 minutes (2^32 us) in the future. This is OK, since on irq fire
             // it is checked if the alarm time has passed.
-            pac::TIMER.alarm(n).write_value(timestamp as u32);
+            TIMER.alarm(n).write_value(timestamp as u32);
 
             let now = self.now();
             if timestamp <= now {
                 // If alarm timestamp has passed the alarm will not fire.
                 // Disarm the alarm and return `false` to indicate that.
-                pac::TIMER.armed().write(|w| w.set_armed(1 << n));
+                TIMER.armed().write(|w| w.set_armed(1 << n));
 
                 alarm.timestamp.set(u64::MAX);
 
@@ -105,17 +110,17 @@ impl TimerDriver {
             } else {
                 // Not elapsed, arm it again.
                 // This can happen if it was set more than 2^32 us in the future.
-                pac::TIMER.alarm(n).write_value(timestamp as u32);
+                TIMER.alarm(n).write_value(timestamp as u32);
             }
         });
 
         // clear the irq
-        pac::TIMER.intr().write(|w| w.set_alarm(n, true));
+        TIMER.intr().write(|w| w.set_alarm(n, true));
     }
 
     fn trigger_alarm(&self, n: usize, cs: CriticalSection) {
         // disarm
-        pac::TIMER.armed().write(|w| w.set_armed(1 << n));
+        TIMER.armed().write(|w| w.set_armed(1 << n));
 
         let alarm = &self.alarms.borrow(cs)[n];
         alarm.timestamp.set(u64::MAX);
@@ -138,38 +143,72 @@ pub unsafe fn init() {
     });
 
     // enable all irqs
-    pac::TIMER.inte().write(|w| {
+    TIMER.inte().write(|w| {
         w.set_alarm(0, true);
         w.set_alarm(1, true);
         w.set_alarm(2, true);
         w.set_alarm(3, true);
     });
-    interrupt::TIMER_IRQ_0.enable();
-    interrupt::TIMER_IRQ_1.enable();
-    interrupt::TIMER_IRQ_2.enable();
-    interrupt::TIMER_IRQ_3.enable();
+    #[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(feature = "rt")]
+#[cfg(all(feature = "rt", feature = "rp2040"))]
 #[interrupt]
 fn TIMER_IRQ_0() {
     DRIVER.check_alarm(0)
 }
 
-#[cfg(feature = "rt")]
+#[cfg(all(feature = "rt", feature = "rp2040"))]
 #[interrupt]
 fn TIMER_IRQ_1() {
     DRIVER.check_alarm(1)
 }
 
-#[cfg(feature = "rt")]
+#[cfg(all(feature = "rt", feature = "rp2040"))]
 #[interrupt]
 fn TIMER_IRQ_2() {
     DRIVER.check_alarm(2)
 }
 
-#[cfg(feature = "rt")]
+#[cfg(all(feature = "rt", feature = "rp2040"))]
 #[interrupt]
 fn TIMER_IRQ_3() {
     DRIVER.check_alarm(3)
 }
+
+#[cfg(all(feature = "rt", feature = "rp235x"))]
+#[interrupt]
+fn TIMER0_IRQ_0() {
+    DRIVER.check_alarm(0)
+}
+
+#[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)
+}