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

Single waker

Browse Source
This commit is contained in:
kalkyl 2022-11-14 11:39:55 +01:00
parent 5cfad3f853
commit 8d2d5a30a5
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
embassy-nrf/src/spis.rs
View File

@ -201,12 +201,12 @@ impl<'d, T: Instance> Spis<'d, T> {
let s = T::state(); let s = T::state();
if r.events_end.read().bits() != 0 { if r.events_end.read().bits() != 0 {
s.end_waker.wake(); s.waker.wake();
r.intenclr.write(|w| w.end().clear()); r.intenclr.write(|w| w.end().clear());
} }
if r.events_acquired.read().bits() != 0 { if r.events_acquired.read().bits() != 0 {
s.acquire_waker.wake(); s.waker.wake();
r.intenclr.write(|w| w.acquired().clear()); r.intenclr.write(|w| w.acquired().clear());
} }
} }
@ -295,7 +295,7 @@ impl<'d, T: Instance> Spis<'d, T> {
// Wait until CPU has acquired the semaphore. // Wait until CPU has acquired the semaphore.
poll_fn(|cx| { poll_fn(|cx| {
s.acquire_waker.register(cx.waker()); s.waker.register(cx.waker());
if r.semstat.read().bits() == 1 { if r.semstat.read().bits() == 1 {
return Poll::Ready(()); return Poll::Ready(());
} }
@ -310,7 +310,7 @@ impl<'d, T: Instance> Spis<'d, T> {
// Wait for 'end' event. // Wait for 'end' event.
r.intenset.write(|w| w.end().set()); r.intenset.write(|w| w.end().set());
poll_fn(|cx| { poll_fn(|cx| {
s.end_waker.register(cx.waker()); s.waker.register(cx.waker());
if r.events_end.read().bits() != 0 { if r.events_end.read().bits() != 0 {
return Poll::Ready(()); return Poll::Ready(());
} }
@ -451,15 +451,13 @@ pub(crate) mod sealed {
use super::*; use super::*;
pub struct State { pub struct State {
pub end_waker: AtomicWaker, pub waker: AtomicWaker,
pub acquire_waker: AtomicWaker,
} }
impl State { impl State {
pub const fn new() -> Self { pub const fn new() -> Self {
Self { Self {
end_waker: AtomicWaker::new(), waker: AtomicWaker::new(),
acquire_waker: AtomicWaker::new(),
} }
} }
} }