diff options
| author | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
|---|---|---|
| committer | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
| commit | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /embassy-rp/src/timer.rs | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to 'embassy-rp/src/timer.rs')
| -rw-r--r-- | embassy-rp/src/timer.rs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/embassy-rp/src/timer.rs b/embassy-rp/src/timer.rs index 68793950f..ca8c96c0f 100644 --- a/embassy-rp/src/timer.rs +++ b/embassy-rp/src/timer.rs | |||
| @@ -6,7 +6,7 @@ use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; | |||
| 6 | use embassy_sync::blocking_mutex::Mutex; | 6 | use embassy_sync::blocking_mutex::Mutex; |
| 7 | use embassy_time::driver::{AlarmHandle, Driver}; | 7 | use embassy_time::driver::{AlarmHandle, Driver}; |
| 8 | 8 | ||
| 9 | use crate::interrupt::Interrupt; | 9 | use crate::interrupt::InterruptExt; |
| 10 | use crate::{interrupt, pac}; | 10 | use crate::{interrupt, pac}; |
| 11 | 11 | ||
| 12 | struct AlarmState { | 12 | struct AlarmState { |
| @@ -145,27 +145,31 @@ pub unsafe fn init() { | |||
| 145 | w.set_alarm(2, true); | 145 | w.set_alarm(2, true); |
| 146 | w.set_alarm(3, true); | 146 | w.set_alarm(3, true); |
| 147 | }); | 147 | }); |
| 148 | interrupt::TIMER_IRQ_0::enable(); | 148 | interrupt::TIMER_IRQ_0.enable(); |
| 149 | interrupt::TIMER_IRQ_1::enable(); | 149 | interrupt::TIMER_IRQ_1.enable(); |
| 150 | interrupt::TIMER_IRQ_2::enable(); | 150 | interrupt::TIMER_IRQ_2.enable(); |
| 151 | interrupt::TIMER_IRQ_3::enable(); | 151 | interrupt::TIMER_IRQ_3.enable(); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | #[cfg(feature = "rt")] | ||
| 154 | #[interrupt] | 155 | #[interrupt] |
| 155 | unsafe fn TIMER_IRQ_0() { | 156 | unsafe fn TIMER_IRQ_0() { |
| 156 | DRIVER.check_alarm(0) | 157 | DRIVER.check_alarm(0) |
| 157 | } | 158 | } |
| 158 | 159 | ||
| 160 | #[cfg(feature = "rt")] | ||
| 159 | #[interrupt] | 161 | #[interrupt] |
| 160 | unsafe fn TIMER_IRQ_1() { | 162 | unsafe fn TIMER_IRQ_1() { |
| 161 | DRIVER.check_alarm(1) | 163 | DRIVER.check_alarm(1) |
| 162 | } | 164 | } |
| 163 | 165 | ||
| 166 | #[cfg(feature = "rt")] | ||
| 164 | #[interrupt] | 167 | #[interrupt] |
| 165 | unsafe fn TIMER_IRQ_2() { | 168 | unsafe fn TIMER_IRQ_2() { |
| 166 | DRIVER.check_alarm(2) | 169 | DRIVER.check_alarm(2) |
| 167 | } | 170 | } |
| 168 | 171 | ||
| 172 | #[cfg(feature = "rt")] | ||
| 169 | #[interrupt] | 173 | #[interrupt] |
| 170 | unsafe fn TIMER_IRQ_3() { | 174 | unsafe fn TIMER_IRQ_3() { |
| 171 | DRIVER.check_alarm(3) | 175 | DRIVER.check_alarm(3) |
