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

Align F3 family

Browse Source
This commit is contained in:
Rasmus Melchior Jacobsen 2023-03-25 06:05:37 +01:00
parent 6c73b23f38
commit 7edd72f8f5
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,14 @@
use core::convert::TryInto; use core::convert::TryInto;
use core::mem::size_of;
use core::ptr::write_volatile; use core::ptr::write_volatile;
use super::FlashRegion;
use crate::flash::Error; use crate::flash::Error;
use crate::pac; use crate::pac;
pub(crate) const MAX_WRITE_SIZE: usize = super::MAINA::WRITE_SIZE;
pub(crate) const MAX_ERASE_SIZE: usize = super::MAINA::ERASE_SIZE;
pub(crate) unsafe fn lock() { pub(crate) unsafe fn lock() {
pac::FLASH.cr().modify(|w| w.set_lock(true)); pac::FLASH.cr().modify(|w| w.set_lock(true));
} }
@ -13,15 +18,17 @@ pub(crate) unsafe fn unlock() {
pac::FLASH.keyr().write(|w| w.set_fkeyr(0xCDEF_89AB)); pac::FLASH.keyr().write(|w| w.set_fkeyr(0xCDEF_89AB));
} }
pub(crate) unsafe fn blocking_write(offset: u32, buf: &[u8]) -> Result<(), Error> { pub(crate) unsafe fn blocking_write(first_address: u32, buf: &[u8]) -> Result<(), Error> {
pac::FLASH.cr().write(|w| w.set_pg(true)); pac::FLASH.cr().write(|w| w.set_pg(true));
let ret = { let ret = {
let mut ret: Result<(), Error> = Ok(()); let mut ret: Result<(), Error> = Ok(());
let mut offset = offset; let mut address = first_address;
for chunk in buf.chunks(2) { let chunks = buf.chunks_exact(size_of::<u16>());
write_volatile(offset as *mut u16, u16::from_le_bytes(chunk[0..2].try_into().unwrap())); assert!(chunks.remainder().is_empty());
offset += chunk.len() as u32; for chunk in chunks {
write_volatile(address as *mut u16, u16::from_le_bytes(chunk.try_into().unwrap()));
address += chunk.len() as u32;
ret = blocking_wait_ready(); ret = blocking_wait_ready();
if ret.is_err() { if ret.is_err() {
@ -36,8 +43,8 @@ pub(crate) unsafe fn blocking_write(offset: u32, buf: &[u8]) -> Result<(), Error
ret ret
} }
pub(crate) unsafe fn blocking_erase(from: u32, to: u32) -> Result<(), Error> { pub(crate) unsafe fn blocking_erase(from_address: u32, to_address: u32) -> Result<(), Error> {
for page in (from..to).step_by(super::ERASE_SIZE) { for page in (from_address..to_address).step_by(MAX_ERASE_SIZE) {
pac::FLASH.cr().modify(|w| { pac::FLASH.cr().modify(|w| {
w.set_per(true); w.set_per(true);
}); });