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

Expose get_sector in favor of is_eraseable_range

Browse Source
This commit is contained in:
Rasmus Melchior Jacobsen
2023-03-29 12:49:13 +02:00
parent 4ee3d15519
commit 69944675a3
7 changed files with 81 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,24 +63,10 @@ pub(crate) unsafe fn blocking_write(start_address: u32, buf: &[u8; WRITE_SIZE])
blocking_wait_ready()
}
pub(crate) fn is_eraseable_range(start_address: u32, end_address: u32) -> bool {
let dual_bank = is_dual_bank();
let mut address = start_address;
while address < end_address {
let sector = get_sector(address, dual_bank, FLASH_SIZE as u32);
if sector.start != address {
return false;
}
address += sector.size;
}
address == end_address
}
pub(crate) unsafe fn blocking_erase(start_address: u32, end_address: u32) -> Result<(), Error> {
let dual_bank = is_dual_bank();
let mut address = start_address;
while address < end_address {
let sector = get_sector(address, dual_bank, FLASH_SIZE as u32);
let sector = get_sector(address);
erase_sector(sector.index)?;
address += sector.size;
}
@ -145,7 +131,11 @@ unsafe fn blocking_wait_ready() -> Result<(), Error> {
}
}
fn get_sector(address: u32, dual_bank: bool, flash_size: u32) -> FlashSector {
pub(crate) fn get_sector(address: u32) -> FlashSector {
get_sector_inner(address, is_dual_bank(), FLASH_SIZE)
}
fn get_sector_inner(address: u32, dual_bank: bool, flash_size: u32) -> FlashSector {
let offset = address - FLASH_BASE as u32;
if !dual_bank {
get_single_bank_sector(offset)
@ -187,7 +177,10 @@ fn get_single_bank_sector(offset: u32) -> FlashSector {
let large_sector_index = i - 1;
FlashSector {
index: (5 + large_sector_index) as u8,
start: FLASH_BASE as u32 + 4 * SMALL_SECTOR_SIZE + MEDIUM_SECTOR_SIZE + large_sector_index * LARGE_SECTOR_SIZE,
start: FLASH_BASE as u32
+ 4 * SMALL_SECTOR_SIZE
+ MEDIUM_SECTOR_SIZE
+ large_sector_index * LARGE_SECTOR_SIZE,
size: LARGE_SECTOR_SIZE,
}
}
@ -201,7 +194,10 @@ mod tests {
#[test]
fn can_get_sector_single_bank() {
let assert_sector = |index: u8, start: u32, size: u32, addr: u32| {
assert_eq!(FlashSector { index, start, size }, get_sector(addr, false, 1024 * 1024))
assert_eq!(
FlashSector { index, start, size },
get_sector_inner(addr, false, 1024 * 1024)
)
};
assert_sector(0, 0x0800_0000, SMALL_SECTOR_SIZE, 0x0800_0000);
@ -221,7 +217,10 @@ mod tests {
#[test]
fn can_get_sector_dual_bank() {
let assert_sector = |index: u8, start: u32, size: u32, addr: u32| {
assert_eq!(FlashSector { index, start, size }, get_sector(addr, true, 1024 * 1024))
assert_eq!(
FlashSector { index, start, size },
get_sector_inner(addr, true, 1024 * 1024)
)
};
assert_sector(0, 0x0800_0000, SMALL_SECTOR_SIZE, 0x0800_0000);