MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NVM: consideration of SoftDevice memory layout (#977)

Browse Source
This commit is contained in:
d00616
2017-11-07 21:54:00 +01:00
committed by Henrik Ekblad
parent 2d5404de97
commit 0042cd4bee
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/NVM/VirtualPage.cpp
+3 -4
View File
@@ -300,7 +300,7 @@ void VirtualPageClass::format()
uint32_t *VirtualPageClass::get_page_address(uint16_t page)
{
return (uint32_t *)((Flash.page_count() << Flash.page_size_bits()) -
return (uint32_t *)(Flash.top_app_page_address() -
((page + VNM_VIRTUAL_PAGE_SKIP_FROM_TOP)
<< VNM_VIRTUAL_PAGE_SIZE_BITS));
}
@@ -336,7 +336,6 @@ void VirtualPageClass::build_page(uint32_t *address, uint32_t magic)
uint32_t VirtualPageClass::get_page_erase_cycles(uint32_t *address)
{
// Return number of cycles
return ((uint32_t)address[OFFSET_ERASE_COUNTER] &
(uint32_t)MASK_ERASE_COUNTER) +
1;
return ((((uint32_t)address[OFFSET_ERASE_COUNTER])+1) &
(uint32_t)MASK_ERASE_COUNTER);
}