Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_FlashStorage: clarify space-available-for-write check

This commit is contained in:
Peter Barker 2020-04-09 13:45:52 +10:00 committed by Andrew Tridgell
parent c4217f329b
commit 2988c70627
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_FlashStorage/AP_FlashStorage.cpp
View File

@ -187,7 +187,9 @@ bool AP_FlashStorage::write(uint16_t offset, uint16_t length)
n = length; n = length;
} }
if (write_offset > flash_sector_size - (sizeof(struct block_header) + max_write + reserved_space)) { const uint32_t space_available = flash_sector_size - write_offset;
const uint32_t space_required = sizeof(struct block_header) + max_write + reserved_space;
if (space_available < space_required) {
if (!switch_sectors()) { if (!switch_sectors()) {
if (!flash_erase_ok()) { if (!flash_erase_ok()) {
return false; return false;