nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-21 22:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle signature changes from upstream

Browse Source
This commit is contained in:
Jacob Trueb 2024-11-12 14:14:10 -06:00
parent db05734c9a
commit 8c67bbc873
2 changed files with 50 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
embassy-nrf/src/pdm.rs
View File

@ -388,42 +388,37 @@ impl<'d, T: Instance> Pdm<'d, T> {
{ {
let r = T::regs(); let r = T::regs();
if r.events_started.read().bits() != 0 { if r.events_started().read() != 0 {
return Err(Error::AlreadyRunning); return Err(Error::AlreadyRunning);
} }
r.sample r.sample().ptr().write_value(vec_raw_parts[0].0 as u32);
.ptr r.sample().maxcnt().write(|w| w.set_buffsize(vec_raw_parts[0].1 as _));
.write(|w| unsafe { w.sampleptr().bits(vec_raw_parts[0].0 as u32) });
r.sample
.maxcnt
.write(|w| unsafe { w.buffsize().bits(vec_raw_parts[0].1 as _) });
// Reset and enable the events // Reset and enable the events
r.events_end.reset(); r.events_end().write_value(0);
r.events_started.reset(); r.events_started().write_value(0);
r.events_stopped.reset(); r.events_stopped().write_value(0);
r.intenset.write(|w| { r.intenset().write(|w| {
w.end().set(); w.set_end(true);
w.started().set(); w.set_started(true);
w.stopped().set(); w.set_stopped(true);
w
}); });
// Don't reorder the start event before the previous writes. Hopefully self // Don't reorder the start event before the previous writes. Hopefully self
// wouldn't happen anyway. // wouldn't happen anyway.
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
r.tasks_start.write(|w| unsafe { w.bits(1) }); r.tasks_start().write_value(1);
let mut current_buffer = 0; let mut current_buffer = 0;
let mut done = false; let mut done = false;
let drop = OnDrop::new(|| { let drop = OnDrop::new(|| {
r.tasks_stop.write(|w| unsafe { w.bits(1) }); r.tasks_stop().write_value(1);
// N.B. It would be better if this were async, but Drop only support sync code. // N.B. It would be better if this were async, but Drop only support sync code.
while r.events_stopped.read().bits() != 0 {} while r.events_stopped().read() != 0 {}
}); });
// Wait for events and complete when the sampler indicates it has had enough. // Wait for events and complete when the sampler indicates it has had enough.
@ -432,11 +427,11 @@ impl<'d, T: Instance> Pdm<'d, T> {
T::state().waker.register(cx.waker()); T::state().waker.register(cx.waker());
if r.events_end.read().bits() != 0 { if r.events_end().read() != 0 {
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
r.events_end.reset(); r.events_end().write_value(0);
r.intenset.write(|w| w.end().set()); r.intenset().write(|w| w.set_end(true));
if !done { if !done {
// Discard the last buffer after the user requested a stop. // Discard the last buffer after the user requested a stop.
@ -448,24 +443,22 @@ impl<'d, T: Instance> Pdm<'d, T> {
} }
DoubleBufferSampleState::Stop => { DoubleBufferSampleState::Stop => {
vec_raw_parts[current_buffer] = (0 as _, 0, 0); vec_raw_parts[current_buffer] = (0 as _, 0, 0);
r.tasks_stop.write(|w| unsafe { w.bits(1) }); r.tasks_stop().write_value(1);
done = true; done = true;
} }
} }
}; };
} }
if r.events_started.read().bits() != 0 { if r.events_started().read() != 0 {
r.events_started.reset(); r.events_started().write_value(0);
r.intenset.write(|w| w.started().set()); r.intenset().write(|w| w.set_started(true));
let next_buffer = 1 - current_buffer; let next_buffer = 1 - current_buffer;
r.sample r.sample().ptr().write_value(vec_raw_parts[next_buffer].0 as u32);
.ptr
.write(|w| unsafe { w.sampleptr().bits(vec_raw_parts[next_buffer].0 as u32) });
} }
if r.events_stopped.read().bits() != 0 { if r.events_stopped().read() != 0 {
return Poll::Ready(()); return Poll::Ready(());
} }

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

@ -315,8 +315,11 @@ impl<'d, const N: usize> Saadc<'d, N> {
// We want the task start to effectively short with the last one ending so // We want the task start to effectively short with the last one ending so
// we don't miss any samples. It'd be great for the SAADC to offer a SHORTS // we don't miss any samples. It'd be great for the SAADC to offer a SHORTS
// register instead, but it doesn't, so we must use PPI. // register instead, but it doesn't, so we must use PPI.
let mut start_ppi = let mut start_ppi = Ppi::new_one_to_one(
Ppi::new_one_to_one(ppi_ch1, Event::from_reg(&r.events_end), Task::from_reg(&r.tasks_start)); ppi_ch1,
Event::from_reg(r.events_end()),
Task::from_reg(r.tasks_start()),
);
start_ppi.enable(); start_ppi.enable();
let timer = Timer::new(timer); let timer = Timer::new(timer);
@ -326,7 +329,7 @@ impl<'d, const N: usize> Saadc<'d, N> {
let timer_cc = timer.cc(0); let timer_cc = timer.cc(0);
let mut sample_ppi = Ppi::new_one_to_one(ppi_ch2, timer_cc.event_compare(), Task::from_reg(&r.tasks_sample)); let mut sample_ppi = Ppi::new_one_to_one(ppi_ch2, timer_cc.event_compare(), Task::from_reg(r.tasks_sample()));
timer.start(); timer.start();
let mut init = || { let mut init = || {
@ -339,32 +342,28 @@ impl<'d, const N: usize> Saadc<'d, N> {
let r = Self::regs(); let r = Self::regs();
// Establish mode and sample rate // Establish mode and sample rate
r.samplerate.write(|w| unsafe { r.samplerate().write(|w| {
w.cc().bits(0); w.set_cc(0);
w.mode().task(); w.set_mode(vals::SamplerateMode::TASK);
w
}); });
// Set up the initial DMA // Set up the initial DMA
r.result.ptr.write(|w| unsafe { w.ptr().bits(vec_raw_parts[0].0 as _) }); r.result().ptr().write_value(vec_raw_parts[0].0 as u32);
r.result r.result().maxcnt().write(|w| w.set_maxcnt(vec_raw_parts[0].1 as _));
.maxcnt
.write(|w| unsafe { w.maxcnt().bits(vec_raw_parts[0].1 as _) });
// Reset and enable the events // Reset and enable the events
r.events_end.reset(); r.events_end().write_value(0);
r.events_started.reset(); r.events_started().write_value(0);
r.intenset.write(|w| { r.intenset().write(|w| {
w.end().set(); w.set_end(true);
w.started().set(); w.set_started(true);
w
}); });
// Don't reorder the ADC start event before the previous writes. Hopefully self // Don't reorder the ADC start event before the previous writes. Hopefully self
// wouldn't happen anyway. // wouldn't happen anyway.
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
r.tasks_start.write(|w| unsafe { w.bits(1) }); r.tasks_start().write_value(1);
let mut inited = false; let mut inited = false;
@ -376,11 +375,11 @@ impl<'d, const N: usize> Saadc<'d, N> {
WAKER.register(cx.waker()); WAKER.register(cx.waker());
if r.events_end.read().bits() != 0 { if r.events_end().read() != 0 {
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
r.events_end.reset(); r.events_end().write_value(0);
r.intenset.write(|w| w.end().set()); r.intenset().write(|w| w.set_end(true));
match callback(vec_raw_parts[current_buffer]) { match callback(vec_raw_parts[current_buffer]) {
DoubleBufferCallbackResult::Swap(buf) => { DoubleBufferCallbackResult::Swap(buf) => {
@ -395,9 +394,9 @@ impl<'d, const N: usize> Saadc<'d, N> {
} }
} }
if r.events_started.read().bits() != 0 { if r.events_started().read() != 0 {
r.events_started.reset(); r.events_started().write_value(0);
r.intenset.write(|w| w.started().set()); r.intenset().write(|w| w.set_started(true));
if !inited { if !inited {
init(); init();
@ -405,9 +404,7 @@ impl<'d, const N: usize> Saadc<'d, N> {
} }
let next_buffer = 1 - current_buffer; let next_buffer = 1 - current_buffer;
r.result r.result().ptr().write_value(vec_raw_parts[next_buffer].0 as u32);
.ptr
.write(|w| unsafe { w.ptr().bits(vec_raw_parts[next_buffer].0 as u32) });
} }
Poll::Pending Poll::Pending
@ -624,12 +621,10 @@ impl<'d> Saadc<'d, 1> {
impl<'d, const N: usize> Drop for Saadc<'d, N> { impl<'d, const N: usize> Drop for Saadc<'d, N> {
fn drop(&mut self) { fn drop(&mut self) {
let r = Self::regs(); let r = Self::regs();
r.enable.write(|w| w.enable().disabled()); r.enable().write(|w| w.set_enable(false));
for channel in r.ch.iter() { for i in 0..N {
channel.pselp.reset(); let channel = r.ch(i);
channel.pseln.reset(); channel.config().write_value(nrf_pac::saadc::regs::Config::default());
channel.config.reset();
channel.limit.reset();
} }
} }
} }