From 0a4fedd778c8bec4b9be9aba040631ae550d956c Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 22 Oct 2016 12:43:43 +0200 Subject: [PATCH] Dataman: Use single method to infer file compatibility --- src/modules/dataman/dataman.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/modules/dataman/dataman.c b/src/modules/dataman/dataman.c index deef88bf68..da8ef8ffb9 100644 --- a/src/modules/dataman/dataman.c +++ b/src/modules/dataman/dataman.c @@ -941,22 +941,6 @@ task_main(int argc, char *argv[]) g_task_fd = open(k_data_manager_device_path, O_RDONLY | O_BINARY); 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 struct dataman_compat_s 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) { unlink(k_data_manager_device_path); } - -#endif - } /* Open or create the data manager file */