fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-06 18:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dataman: Use single method to infer file compatibility

Browse Source
This commit is contained in:
Lorenz Meier
2016-10-23 16:26:03 +02:00
committed by Lorenz Meier
parent 9e7d5f088e
commit 0a4fedd778
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/dataman/dataman.c
-19
View File
@@ -941,22 +941,6 @@ task_main(int argc, char *argv[])
g_task_fd = open(k_data_manager_device_path, O_RDONLY | O_BINARY); g_task_fd = open(k_data_manager_device_path, O_RDONLY | O_BINARY);
if (g_task_fd >= 0) { if (g_task_fd >= 0) {
#ifndef __PX4_POSIX
// XXX on Mac OS and Linux the file is not a multiple of the sector sizes
// this might need further inspection.
/* File exists, check its size */
int file_size = lseek(g_task_fd, 0, SEEK_END);
if ((file_size % k_sector_size) != 0) {
PX4_WARN("Incompatible data manager file %s, resetting it", k_data_manager_device_path);
PX4_WARN("Size: %u, sector size: %d", file_size, k_sector_size);
close(g_task_fd);
unlink(k_data_manager_device_path);
}
#else
// Read the mission state and check the hash // Read the mission state and check the hash
struct dataman_compat_s compat_state; struct dataman_compat_s compat_state;
int ret = g_dm_ops->read(DM_KEY_COMPAT, 0, &compat_state, sizeof(compat_state)); int ret = g_dm_ops->read(DM_KEY_COMPAT, 0, &compat_state, sizeof(compat_state));
@@ -974,9 +958,6 @@ task_main(int argc, char *argv[])
if (incompat) { if (incompat) {
unlink(k_data_manager_device_path); unlink(k_data_manager_device_path);
} }
#endif
} }
/* Open or create the data manager file */ /* Open or create the data manager file */