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

Avoid context switch and wait for stop

Browse Source 
Should be more efficient given the sub 100 cycles to wait.
This commit is contained in:
huntc 2022-08-31 08:44:28 +10:00
parent dcd8c62169
commit 30641d0564
1 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
embassy-nrf/src/saadc.rs
View File

@ -184,11 +184,6 @@ impl<'d, const N: usize> Saadc<'d, N> {
r.intenclr.write(|w| w.started().clear()); r.intenclr.write(|w| w.started().clear());
WAKER.wake(); WAKER.wake();
} }
if r.events_stopped.read().bits() != 0 {
r.intenclr.write(|w| w.stopped().clear());
WAKER.wake();
}
} }
fn regs() -> &'static saadc::RegisterBlock { fn regs() -> &'static saadc::RegisterBlock {
@ -230,7 +225,7 @@ impl<'d, const N: usize> Saadc<'d, N> {
/// also cause the sampling to be stopped. /// also cause the sampling to be stopped.
pub async fn sample(&mut self, buf: &mut [i16; N]) { pub async fn sample(&mut self, buf: &mut [i16; N]) {
// In case the future is dropped, stop the task and wait for it to end. // In case the future is dropped, stop the task and wait for it to end.
let on_drop = OnDrop::new(Self::stop_sampling_immediately); OnDrop::new(Self::stop_sampling_immediately);
let r = Self::regs(); let r = Self::regs();
@ -263,9 +258,6 @@ impl<'d, const N: usize> Saadc<'d, N> {
Poll::Pending Poll::Pending
}) })
.await; .await;
on_drop.defuse();
Self::stop_sampling().await;
} }
/// Continuous sampling with double buffers. /// Continuous sampling with double buffers.
@ -343,7 +335,7 @@ impl<'d, const N: usize> Saadc<'d, N> {
S: FnMut(&[[i16; N]]) -> SamplerState, S: FnMut(&[[i16; N]]) -> SamplerState,
{ {
// In case the future is dropped, stop the task and wait for it to end. // In case the future is dropped, stop the task and wait for it to end.
let on_drop = OnDrop::new(Self::stop_sampling_immediately); OnDrop::new(Self::stop_sampling_immediately);
let r = Self::regs(); let r = Self::regs();
@ -427,9 +419,6 @@ impl<'d, const N: usize> Saadc<'d, N> {
Poll::Pending Poll::Pending
}) })
.await; .await;
on_drop.defuse();
Self::stop_sampling().await;
} }
// Stop sampling and wait for it to stop in a blocking fashion // Stop sampling and wait for it to stop in a blocking fashion
@ -444,40 +433,6 @@ impl<'d, const N: usize> Saadc<'d, N> {
while r.events_stopped.read().bits() == 0 {} while r.events_stopped.read().bits() == 0 {}
r.events_stopped.reset(); r.events_stopped.reset();
} }
// Stop sampling and wait for it to stop in a non-blocking fashino
async fn stop_sampling() {
let r = Self::regs();
// Reset and enable the events
compiler_fence(Ordering::SeqCst);
r.events_stopped.reset();
r.intenset.write(|w| {
w.stopped().set();
w
});
// Stop
r.tasks_stop.write(|w| unsafe { w.bits(1) });
// Wait for 'stopped' event.
poll_fn(|cx| {
let r = Self::regs();
WAKER.register(cx.waker());
if r.events_stopped.read().bits() != 0 {
r.events_stopped.reset();
return Poll::Ready(());
}
Poll::Pending
})
.await;
}
} }
impl<'d> Saadc<'d, 1> { impl<'d> Saadc<'d, 1> {