M-Labs/thermostat
9
0
Fork 5
Code Issues 9 Pull Requests 5 Releases Wiki Activity

flash_store_refactor #49

Merged
sb10q merged 4 commits from flash_store_refactor into master 2021-01-13 17:30:12 +08:00
Conversation 0 Commits 4 Files Changed 2 +28 -6
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a6466c847a - Show all commits

2
memory.x
View File

@ -13,3 +13,5 @@ MEMORY
_stack_start = ORIGIN(CCMRAM) + LENGTH(CCMRAM); _stack_start = ORIGIN(CCMRAM) + LENGTH(CCMRAM);
_dfu_msg = ORIGIN(DFU_MSG); _dfu_msg = ORIGIN(DFU_MSG);
_config_start = ORIGIN(CONFIG);
sb10q commented 2021-01-13 17:20:31 +08:00
Outdated
Review
Copy Link

Keep the same order as the declarations above.

Keep the same order as the declarations above.
_flash_start = ORIGIN(FLASH);

28
src/flash_store.rs
View File

@ -8,18 +8,37 @@ use sfkv::{Store, StoreBackend};
/// 16 KiB /// 16 KiB
pub const FLASH_SECTOR_SIZE: usize = 0x4000; pub const FLASH_SECTOR_SIZE: usize = 0x4000;
pub const FLASH_SECTOR: u8 = 12; pub const FLASH_SECTOR: u8 = 12;
pub const FLASH_SECTOR_OFFSET: usize = 0x10_0000;
static mut BACKUP_SPACE: [u8; FLASH_SECTOR_SIZE] = [0; FLASH_SECTOR_SIZE]; static mut BACKUP_SPACE: [u8; FLASH_SECTOR_SIZE] = [0; FLASH_SECTOR_SIZE];
extern "C" {
static _config_start: usize;
static _flash_start: usize;
}
pub struct FlashBackend { pub struct FlashBackend {
flash: FLASH, flash: FLASH,
} }
unsafe fn get_offset() -> usize {
let config = core::mem::transmute::<*const usize, usize>(&_config_start);
sb10q commented 2021-01-13 17:19:03 +08:00
Outdated
Review
Copy Link

I suggest moving the unsafe block into this function and marking it safe.

I suggest moving the ``unsafe`` block into this function and marking it safe.
let flash = core::mem::transmute::<*const usize, usize>(&_flash_start);
config - flash
}
impl StoreBackend for FlashBackend { impl StoreBackend for FlashBackend {
type Data = [u8]; type Data = [u8];
fn data(&self) -> &Self::Data { fn data(&self) -> &Self::Data {
&self.flash.read()[FLASH_SECTOR_OFFSET..(FLASH_SECTOR_OFFSET + FLASH_SECTOR_SIZE)] unsafe {
// This works
// let config = core::mem::transmute::<*const usize, usize>(&_config_start);
// let flash = core::mem::transmute::<*const usize, usize>(&_flash_start);
// let config_offset = config - flash;
// This doesn't
// let config_offset = (&_config_start - &_flash_start) as usize;
&self.flash.read()[get_offset()..(get_offset() + FLASH_SECTOR_SIZE)]
}
} }
type Error = Error; type Error = Error;
@ -29,10 +48,11 @@ impl StoreBackend for FlashBackend {
} }
fn program(&mut self, offset: usize, payload: &[u8]) -> Result<(), Self::Error> { fn program(&mut self, offset: usize, payload: &[u8]) -> Result<(), Self::Error> {
unsafe {
self.flash.unlocked() self.flash.unlocked()
.program(FLASH_SECTOR_OFFSET + offset, payload.iter().cloned()) .program(get_offset() + offset, payload.iter().cloned())
}
} }
fn backup_space(&self) -> &'static mut [u8] { fn backup_space(&self) -> &'static mut [u8] {
unsafe { &mut BACKUP_SPACE } unsafe { &mut BACKUP_SPACE }