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

Let sector computation be shared across families

Browse Source
This commit is contained in:
Rasmus Melchior Jacobsen
2023-03-30 08:32:36 +02:00
parent e3c4e00be0
commit e7129371d0
10 changed files with 208 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ use core::ptr::write_volatile;
use atomic_polyfill::{fence, Ordering};
use super::{FlashSector, BANK1_REGION, FLASH_REGIONS, WRITE_SIZE};
use super::{FlashRegion, FlashSector, BANK1_REGION, FLASH_REGIONS, WRITE_SIZE};
use crate::flash::Error;
use crate::pac;
@ -11,6 +11,10 @@ const fn is_dual_bank() -> bool {
FLASH_REGIONS.len() == 2
}
pub(crate) fn get_flash_regions() -> &'static [&'static FlashRegion] {
&FLASH_REGIONS
}
pub(crate) unsafe fn lock() {
pac::FLASH.bank(0).cr().modify(|w| w.set_lock(true));
if is_dual_bank() {
@ -75,11 +79,10 @@ pub(crate) unsafe fn blocking_write(start_address: u32, buf: &[u8; WRITE_SIZE])
}
pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), Error> {
let bank = pac::FLASH.bank(if sector.index >= 8 { 1 } else { 0 });
let sector = sector.index % 8;
let bank = pac::FLASH.bank(sector.bank as usize);
bank.cr().modify(|w| {
w.set_ser(true);
w.set_snb(sector)
w.set_snb(sector.index_in_bank)
});
bank.cr().modify(|w| {
@ -175,13 +178,3 @@ unsafe fn blocking_wait_ready(bank: pac::flash::Bank) -> Result<(), Error> {
}
}
}
pub(crate) fn get_sector(address: u32) -> FlashSector {
let sector_size = BANK1_REGION.erase_size;
let index = address / sector_size;
FlashSector {
index: index as u8,
start: BANK1_REGION.base + index * sector_size,
size: sector_size,
}
}