max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rp/gpio: drop critical_section use

Browse Source 
we don't need critical sections if we just use atomic access aliases.
This commit is contained in:
pennae 2023-05-02 08:34:36 +02:00
parent c6424fdc11
commit 8fc92fdf62
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
embassy-rp/src/gpio.rs
View File

@ -9,7 +9,7 @@ use embassy_sync::waitqueue::AtomicWaker;
use crate::pac::common::{Reg, RW}; use crate::pac::common::{Reg, RW};
use crate::pac::SIO; use crate::pac::SIO;
use crate::{interrupt, pac, peripherals, Peripheral}; use crate::{interrupt, pac, peripherals, Peripheral, RegExt};
const PIN_COUNT: usize = 30; const PIN_COUNT: usize = 30;
const NEW_AW: AtomicWaker = AtomicWaker::new(); const NEW_AW: AtomicWaker = AtomicWaker::new();
@ -158,13 +158,11 @@ unsafe fn IO_IRQ_BANK0() {
// we can just clear all interrupt enables for that pin without having // we can just clear all interrupt enables for that pin without having
// to check which event was signalled. // to check which event was signalled.
if event != 0 { if event != 0 {
critical_section::with(|_| { proc_intx.inte(pin / 8).write_clear(|w| {
proc_intx.inte(pin / 8).modify(|w| { w.set_edge_high(pin_group, true);
w.set_edge_high(pin_group, false); w.set_edge_low(pin_group, true);
w.set_edge_low(pin_group, false); w.set_level_high(pin_group, true);
w.set_level_high(pin_group, false); w.set_level_low(pin_group, true);
w.set_level_low(pin_group, false);
});
}); });
INTERRUPT_WAKERS[pin as usize].wake(); INTERRUPT_WAKERS[pin as usize].wake();
} }
@ -202,8 +200,9 @@ impl<'d, T: Pin> InputFuture<'d, T> {
// Each INTR register is divided into 8 groups, one group for each // Each INTR register is divided into 8 groups, one group for each
// pin, and each group consists of LEVEL_LOW, LEVEL_HIGH, EDGE_LOW, // pin, and each group consists of LEVEL_LOW, LEVEL_HIGH, EDGE_LOW,
// and EGDE_HIGH. // and EGDE_HIGH.
critical_section::with(|_| { pin.int_proc()
pin.int_proc().inte((pin.pin() / 8) as usize).modify(|w| match level { .inte((pin.pin() / 8) as usize)
.write_set(|w| match level {
InterruptTrigger::LevelHigh => { InterruptTrigger::LevelHigh => {
trace!("InputFuture::new enable LevelHigh for pin {}", pin.pin()); trace!("InputFuture::new enable LevelHigh for pin {}", pin.pin());
w.set_level_high(pin_group, true); w.set_level_high(pin_group, true);
@ -222,7 +221,6 @@ impl<'d, T: Pin> InputFuture<'d, T> {
w.set_edge_low(pin_group, true); w.set_edge_low(pin_group, true);
} }
}); });
});
irq.enable(); irq.enable();
} }