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

Simplify SR->Result

Browse Source
This commit is contained in:
Rasmus Melchior Jacobsen 2023-05-25 13:54:40 +02:00
parent baf1c2efbe
commit 8b1eaf00a0
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
embassy-stm32/src/flash/f4.rs
View File

@ -4,6 +4,7 @@ use core::sync::atomic::{fence, Ordering};
#[cfg(feature = "nightly")]
use embassy_sync::waitqueue::AtomicWaker;
use pac::flash::regs::Sr;
use super::{FlashRegion, FlashSector, FLASH_REGIONS, WRITE_SIZE};
use crate::flash::Error;
@ -347,17 +348,7 @@ pub(crate) async unsafe fn wait_ready() -> Result<(), Error> {
let sr = pac::FLASH.sr().read();
if !sr.bsy() {
Poll::Ready(if sr.pgserr() {
Err(Error::Seq)
} else if sr.pgperr() {
Err(Error::Parallelism)
} else if sr.pgaerr() {
Err(Error::Unaligned)
} else if sr.wrperr() {
Err(Error::Protected)
} else {
Ok(())
})
Poll::Ready(get_result(sr))
} else {
return Poll::Pending;
}
@ -370,27 +361,25 @@ unsafe fn wait_ready_blocking() -> Result<(), Error> {
let sr = pac::FLASH.sr().read();
if !sr.bsy() {
if sr.pgserr() {
return Err(Error::Seq);
}
if sr.pgperr() {
return Err(Error::Parallelism);
}
if sr.pgaerr() {
return Err(Error::Unaligned);
}
if sr.wrperr() {
return Err(Error::Protected);
}
return Ok(());
return get_result(sr);
}
}
}
fn get_result(sr: Sr) -> Result<(), Error> {
if sr.pgserr() {
Err(Error::Seq)
} else if sr.pgperr() {
Err(Error::Parallelism)
} else if sr.pgaerr() {
Err(Error::Unaligned)
} else if sr.wrperr() {
Err(Error::Protected)
} else {
Ok(())
}
}
#[cfg(test)]
mod tests {
use super::*;