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

Merge pull request #3745 from dragonnn/nrf_twim

Browse Source 
nrf twim return errors in async_wait instead of waiting indefinitely
This commit is contained in:
Dario Nieuwenhuis 2025-01-08 19:40:10 +01:00 committed by GitHub
commit cd70c19ab5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
embassy-nrf/src/twim.rs
View File

@ -255,7 +255,7 @@ impl<'d, T: Instance> Twim<'d, T> {
} }
/// Get Error instance, if any occurred. /// Get Error instance, if any occurred.
fn check_errorsrc(&self) -> Result<(), Error> { fn check_errorsrc() -> Result<(), Error> {
let r = T::regs(); let r = T::regs();
let err = r.errorsrc().read(); let err = r.errorsrc().read();
@ -329,7 +329,7 @@ impl<'d, T: Instance> Twim<'d, T> {
} }
/// Wait for stop or error /// Wait for stop or error
fn async_wait(&mut self) -> impl Future<Output = ()> { fn async_wait(&mut self) -> impl Future<Output = Result<(), Error>> {
poll_fn(move |cx| { poll_fn(move |cx| {
let r = T::regs(); let r = T::regs();
let s = T::state(); let s = T::state();
@ -338,13 +338,18 @@ impl<'d, T: Instance> Twim<'d, T> {
if r.events_suspended().read() != 0 || r.events_stopped().read() != 0 { if r.events_suspended().read() != 0 || r.events_stopped().read() != 0 {
r.events_stopped().write_value(0); r.events_stopped().write_value(0);
return Poll::Ready(()); return Poll::Ready(Ok(()));
} }
// stop if an error occurred // stop if an error occurred
if r.events_error().read() != 0 { if r.events_error().read() != 0 {
r.events_error().write_value(0); r.events_error().write_value(0);
r.tasks_stop().write_value(1); r.tasks_stop().write_value(1);
if let Err(e) = Self::check_errorsrc() {
return Poll::Ready(Err(e));
} else {
panic!("Found events_error bit without an error in errorsrc reg");
}
} }
Poll::Pending Poll::Pending
@ -503,7 +508,7 @@ impl<'d, T: Instance> Twim<'d, T> {
fn check_operations(&mut self, operations: &[Operation<'_>]) -> Result<(), Error> { fn check_operations(&mut self, operations: &[Operation<'_>]) -> Result<(), Error> {
compiler_fence(SeqCst); compiler_fence(SeqCst);
self.check_errorsrc()?; Self::check_errorsrc()?;
assert!(operations.len() == 1 || operations.len() == 2); assert!(operations.len() == 1 || operations.len() == 2);
match operations { match operations {
@ -626,7 +631,7 @@ impl<'d, T: Instance> Twim<'d, T> {
while !operations.is_empty() { while !operations.is_empty() {
let ops = self.setup_operations(address, operations, Some(&mut tx_ram_buffer), last_op, true)?; let ops = self.setup_operations(address, operations, Some(&mut tx_ram_buffer), last_op, true)?;
let (in_progress, rest) = operations.split_at_mut(ops); let (in_progress, rest) = operations.split_at_mut(ops);
self.async_wait().await; self.async_wait().await?;
self.check_operations(in_progress)?; self.check_operations(in_progress)?;
last_op = in_progress.last(); last_op = in_progress.last();
operations = rest; operations = rest;
@ -644,7 +649,7 @@ impl<'d, T: Instance> Twim<'d, T> {
while !operations.is_empty() { while !operations.is_empty() {
let ops = self.setup_operations(address, operations, None, last_op, true)?; let ops = self.setup_operations(address, operations, None, last_op, true)?;
let (in_progress, rest) = operations.split_at_mut(ops); let (in_progress, rest) = operations.split_at_mut(ops);
self.async_wait().await; self.async_wait().await?;
self.check_operations(in_progress)?; self.check_operations(in_progress)?;
last_op = in_progress.last(); last_op = in_progress.last();
operations = rest; operations = rest;