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 +1 -10
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cef9cf6f48 - Show all commits

11
src/flash_store.rs
View File

@ -20,9 +20,7 @@ pub struct FlashBackend {
} }
unsafe fn get_offset() -> usize { unsafe fn get_offset() -> usize {
let config = core::mem::transmute::<*const usize, usize>(&_config_start); (&_config_start as *const usize as usize) - (&_flash_start as *const usize as usize)
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 {
@ -30,13 +28,6 @@ impl StoreBackend for FlashBackend {
fn data(&self) -> &Self::Data { fn data(&self) -> &Self::Data {
unsafe { 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)] &self.flash.read()[get_offset()..(get_offset() + FLASH_SECTOR_SIZE)]
} }
} }