aboutsummaryrefslogtreecommitdiff
path: root/embassy-rp/src/timer.rs
diff options
context:
space:
mode:
authorGhaith Oueslati <[email protected]>2023-06-12 14:28:23 +0100
committerGitHub <[email protected]>2023-06-12 14:28:23 +0100
commitcf83f6820cf2c6ece607cd60cfdab9d5e47efd04 (patch)
tree6485dacac7e61c4378ac522e709edb0a86bd7523 /embassy-rp/src/timer.rs
parent2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff)
parent2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (diff)
Merge pull request #3 from OueslatiGhaith/master
fix merge conflicts
Diffstat (limited to 'embassy-rp/src/timer.rs')
-rw-r--r--embassy-rp/src/timer.rs14
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;
6use embassy_sync::blocking_mutex::Mutex; 6use embassy_sync::blocking_mutex::Mutex;
7use embassy_time::driver::{AlarmHandle, Driver}; 7use embassy_time::driver::{AlarmHandle, Driver};
8 8
9use crate::interrupt::Interrupt; 9use crate::interrupt::InterruptExt;
10use crate::{interrupt, pac}; 10use crate::{interrupt, pac};
11 11
12struct AlarmState { 12struct 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]
155unsafe fn TIMER_IRQ_0() { 156unsafe 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]
160unsafe fn TIMER_IRQ_1() { 162unsafe 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]
165unsafe fn TIMER_IRQ_2() { 168unsafe 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]
170unsafe fn TIMER_IRQ_3() { 174unsafe fn TIMER_IRQ_3() {
171 DRIVER.check_alarm(3) 175 DRIVER.check_alarm(3)