Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

HAL_Linux: cope with expansion of storage from 4096 to 16k

Browse Source
This commit is contained in:
Andrew Tridgell 2015-06-30 16:45:49 +10:00
parent 87776d8a4b
commit 281f6d9caa
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/AP_HAL_Linux/Storage.cpp
View File

@ -50,15 +50,27 @@ void LinuxStorage::_storage_open(void)
}
_dirty_mask = 0;
int fd = open(STORAGE_FILE, O_RDONLY);
int fd = open(STORAGE_FILE, O_RDWR);
if (fd == -1) {
_storage_create();
fd = open(STORAGE_FILE, O_RDONLY);
fd = open(STORAGE_FILE, O_RDWR);
if (fd == -1) {
hal.scheduler->panic("Failed to open " STORAGE_FILE);
}
}
if (read(fd, _buffer, sizeof(_buffer)) != sizeof(_buffer)) {
memset(_buffer, 0, sizeof(_buffer));
/*
we allow a read of size 4096 to cope with the old storage size
without forcing users to reset all parameters
*/
ssize_t ret = read(fd, _buffer, sizeof(_buffer));
if (ret == 4096 && ret != sizeof(_buffer)) {
if (ftruncate(fd, sizeof(_buffer)) != 0) {
hal.scheduler->panic("Failed to expand " STORAGE_FILE);
}
ret = sizeof(_buffer);
}
if (ret != sizeof(_buffer)) {
close(fd);
_storage_create();
fd = open(STORAGE_FILE, O_RDONLY);