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

Merge pull request #1725 from embassy-rs/flash-pointless-set-bits

Browse Source 
stm32/flash: avoid pointless "if flag is set, set it".
This commit is contained in:
Dario Nieuwenhuis 2023-07-31 10:55:30 +00:00 committed by GitHub
commit 71fcea159f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
embassy-stm32/src/flash/f0.rs
View File

@ -76,17 +76,9 @@ pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), E
}
pub(crate) unsafe fn clear_all_err() {
pac::FLASH.sr().modify(|w| {
if w.pgerr() {
w.set_pgerr(true);
}
if w.wrprt() {
w.set_wrprt(true)
};
if w.eop() {
w.set_eop(true);
}
});
// read and write back the same value.
// This clears all "write 0 to clear" bits.
pac::FLASH.sr().modify(|_| {});
}
unsafe fn wait_ready_blocking() -> Result<(), Error> {

14
embassy-stm32/src/flash/f3.rs
View File

@ -76,17 +76,9 @@ pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), E
}
pub(crate) unsafe fn clear_all_err() {
pac::FLASH.sr().modify(|w| {
if w.pgerr() {
w.set_pgerr(true);
}
if w.wrprterr() {
w.set_wrprterr(true);
}
if w.eop() {
w.set_eop(true);
}
});
// read and write back the same value.
// This clears all "write 0 to clear" bits.
pac::FLASH.sr().modify(|_| {});
}
unsafe fn wait_ready_blocking() -> Result<(), Error> {

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

@ -336,12 +336,9 @@ pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), E
}
pub(crate) fn clear_all_err() {
pac::FLASH.sr().write(|w| {
w.set_pgserr(true);
w.set_pgperr(true);
w.set_pgaerr(true);
w.set_wrperr(true);
});
// read and write back the same value.
// This clears all "write 0 to clear" bits.
pac::FLASH.sr().modify(|_| {});
}
pub(crate) async fn wait_ready() -> Result<(), Error> {

20
embassy-stm32/src/flash/f7.rs
View File

@ -66,23 +66,9 @@ pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), E
}
pub(crate) unsafe fn clear_all_err() {
pac::FLASH.sr().modify(|w| {
if w.erserr() {
w.set_erserr(true);
}
if w.pgperr() {
w.set_pgperr(true);
}
if w.pgaerr() {
w.set_pgaerr(true);
}
if w.wrperr() {
w.set_wrperr(true);
}
if w.eop() {
w.set_eop(true);
}
});
// read and write back the same value.
// This clears all "write 0 to clear" bits.
pac::FLASH.sr().modify(|_| {});
}
unsafe fn blocking_wait_ready() -> Result<(), Error> {

26
embassy-stm32/src/flash/g0.rs
View File

@ -89,27 +89,7 @@ pub(crate) unsafe fn wait_ready_blocking() -> Result<(), Error> {
}
pub(crate) unsafe fn clear_all_err() {
pac::FLASH.sr().modify(|w| {
if w.progerr() {
w.set_progerr(true);
}
if w.pgserr() {
w.set_pgserr(true);
}
if w.rderr() {
w.set_rderr(true);
}
if w.optverr() {
w.set_optverr(true);
}
if w.sizerr() {
w.set_sizerr(true);
}
if w.pgaerr() {
w.set_pgaerr(true);
}
if w.wrperr() {
w.set_wrperr(true);
}
});
// read and write back the same value.
// This clears all "write 0 to clear" bits.
pac::FLASH.sr().modify(|_| {});
}

36
embassy-stm32/src/flash/h7.rs
View File

@ -104,39 +104,9 @@ pub(crate) unsafe fn clear_all_err() {
}
unsafe fn bank_clear_all_err(bank: pac::flash::Bank) {
bank.sr().modify(|w| {
if w.wrperr() {
w.set_wrperr(true);
}
if w.pgserr() {
w.set_pgserr(true);
}
if w.strberr() {
// single address was written multiple times, can be ignored
w.set_strberr(true);
}
if w.incerr() {
// writing to a different address when programming 256 bit word was not finished
w.set_incerr(true);
}
if w.operr() {
w.set_operr(true);
}
if w.sneccerr1() {
// single ECC error
w.set_sneccerr1(true);
}
if w.dbeccerr() {
// double ECC error
w.set_dbeccerr(true);
}
if w.rdperr() {
w.set_rdperr(true);
}
if w.rdserr() {
w.set_rdserr(true);
}
});
// read and write back the same value.
// This clears all "write 0 to clear" bits.
bank.sr().modify(|_| {});
}
unsafe fn blocking_wait_ready(bank: pac::flash::Bank) -> Result<(), Error> {

38
embassy-stm32/src/flash/l.rs
View File

@ -113,41 +113,9 @@ pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), E
}
pub(crate) unsafe fn clear_all_err() {
pac::FLASH.sr().modify(|w| {
#[cfg(any(flash_wl, flash_wb, flash_l4, flash_l0))]
if w.rderr() {
w.set_rderr(true);
}
#[cfg(any(flash_wl, flash_wb, flash_l4))]
if w.fasterr() {
w.set_fasterr(true);
}
#[cfg(any(flash_wl, flash_wb, flash_l4))]
if w.miserr() {
w.set_miserr(true);
}
#[cfg(any(flash_wl, flash_wb, flash_l4))]
if w.pgserr() {
w.set_pgserr(true);
}
if w.sizerr() {
w.set_sizerr(true);
}
if w.pgaerr() {
w.set_pgaerr(true);
}
if w.wrperr() {
w.set_wrperr(true);
}
#[cfg(any(flash_wl, flash_wb, flash_l4))]
if w.progerr() {
w.set_progerr(true);
}
#[cfg(any(flash_wl, flash_wb, flash_l4))]
if w.operr() {
w.set_operr(true);
}
});
// read and write back the same value.
// This clears all "write 0 to clear" bits.
pac::FLASH.sr().modify(|_| {});
}
unsafe fn wait_ready_blocking() -> Result<(), Error> {