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

rp/pio: use atomic accesses, not critical sections

Browse Source 
atomic accesses are not only faster but also can't conflict with other
critical sections.
This commit is contained in:
pennae 2023-04-25 18:44:02 +02:00
parent a10850a6da
commit f2469776f4
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
embassy-rp/src/pio.rs
View File

@ -117,10 +117,8 @@ impl<'d, PIO: PioInstance, SM: PioStateMachine + Unpin> Future for FifoOutFuture
unsafe { unsafe {
let irq = PIO::Irq::steal(); let irq = PIO::Irq::steal();
irq.disable(); irq.disable();
critical_section::with(|_| { PIOS[PIO::PIO_NO as usize].irqs(0).inte().write_set(|m| {
PIOS[PIO::PIO_NO as usize].irqs(0).inte().modify(|m| { m.0 = TXNFULL_MASK << SM::Sm::SM_NO;
m.0 |= TXNFULL_MASK << SM::Sm::SM_NO;
});
}); });
irq.enable(); irq.enable();
} }
@ -133,10 +131,8 @@ impl<'d, PIO: PioInstance, SM: PioStateMachine + Unpin> Future for FifoOutFuture
impl<'d, PIO: PioInstance, SM: PioStateMachine + Unpin> Drop for FifoOutFuture<'d, PIO, SM> { impl<'d, PIO: PioInstance, SM: PioStateMachine + Unpin> Drop for FifoOutFuture<'d, PIO, SM> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
critical_section::with(|_| { PIOS[PIO::PIO_NO as usize].irqs(0).inte().write_clear(|m| {
PIOS[PIO::PIO_NO as usize].irqs(0).inte().modify(|m| { m.0 = TXNFULL_MASK << SM::Sm::SM_NO;
m.0 &= !(TXNFULL_MASK << SM::Sm::SM_NO);
});
}); });
} }
} }
@ -177,10 +173,8 @@ impl<'d, PIO: PioInstance, SM: PioStateMachine> Future for FifoInFuture<'d, PIO,
unsafe { unsafe {
let irq = PIO::Irq::steal(); let irq = PIO::Irq::steal();
irq.disable(); irq.disable();
critical_section::with(|_| { PIOS[PIO::PIO_NO as usize].irqs(0).inte().write_set(|m| {
PIOS[PIO::PIO_NO as usize].irqs(0).inte().modify(|m| { m.0 = RXNEMPTY_MASK << SM::Sm::SM_NO;
m.0 |= RXNEMPTY_MASK << SM::Sm::SM_NO;
});
}); });
irq.enable(); irq.enable();
} }
@ -193,10 +187,8 @@ impl<'d, PIO: PioInstance, SM: PioStateMachine> Future for FifoInFuture<'d, PIO,
impl<'d, PIO: PioInstance, SM: PioStateMachine> Drop for FifoInFuture<'d, PIO, SM> { impl<'d, PIO: PioInstance, SM: PioStateMachine> Drop for FifoInFuture<'d, PIO, SM> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
critical_section::with(|_| { PIOS[PIO::PIO_NO as usize].irqs(0).inte().write_clear(|m| {
PIOS[PIO::PIO_NO as usize].irqs(0).inte().modify(|m| { m.0 = RXNEMPTY_MASK << SM::Sm::SM_NO;
m.0 &= !(RXNEMPTY_MASK << SM::Sm::SM_NO);
});
}); });
} }
} }
@ -250,10 +242,8 @@ impl<'d, PIO: PioInstance> Future for IrqFuture<PIO> {
unsafe { unsafe {
let irq = PIO::Irq::steal(); let irq = PIO::Irq::steal();
irq.disable(); irq.disable();
critical_section::with(|_| { PIOS[PIO::PIO_NO as usize].irqs(0).inte().write_set(|m| {
PIOS[PIO::PIO_NO as usize].irqs(0).inte().modify(|m| { m.0 = SMIRQ_MASK << self.irq_no;
m.0 |= SMIRQ_MASK << self.irq_no;
});
}); });
irq.enable(); irq.enable();
} }
@ -264,10 +254,8 @@ impl<'d, PIO: PioInstance> Future for IrqFuture<PIO> {
impl<'d, PIO: PioInstance> Drop for IrqFuture<PIO> { impl<'d, PIO: PioInstance> Drop for IrqFuture<PIO> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
critical_section::with(|_| { PIOS[PIO::PIO_NO as usize].irqs(0).inte().write_clear(|m| {
PIOS[PIO::PIO_NO as usize].irqs(0).inte().modify(|m| { m.0 = SMIRQ_MASK << self.irq_no;
m.0 &= !(SMIRQ_MASK << self.irq_no);
});
}); });
} }
} }