From fd10c5e9e14010ad105611b05915fa0d2a6f4479 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 15 May 2023 11:44:22 +1000 Subject: [PATCH] AP_Param: replace HAVE_FILESYSTEM_SUPPORT with backend defines --- libraries/AP_Param/AP_Param.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Param/AP_Param.cpp b/libraries/AP_Param/AP_Param.cpp index 2aac0a5991..b91ed5a354 100644 --- a/libraries/AP_Param/AP_Param.cpp +++ b/libraries/AP_Param/AP_Param.cpp @@ -1549,7 +1549,7 @@ void AP_Param::reload_defaults_file(bool last_pass) } #endif -#if HAL_OS_POSIX_IO == 1 +#if AP_FILESYSTEM_POSIX_ENABLED /* if the HAL specifies a defaults parameter file then override defaults using that file @@ -2135,7 +2135,8 @@ bool AP_Param::parse_param_line(char *line, char **vname, float &value, bool &re } -#if HAVE_FILESYSTEM_SUPPORT +// FIXME: make this AP_FILESYSTEM_FILE_READING_ENABLED +#if AP_FILESYSTEM_FATFS_ENABLED || AP_FILESYSTEM_POSIX_ENABLED // increments num_defaults for each default found in filename bool AP_Param::count_defaults_in_file(const char *filename, uint16_t &num_defaults) @@ -2276,7 +2277,7 @@ bool AP_Param::load_defaults_file(const char *filename, bool last_pass) return true; } -#endif // HAVE_FILESYSTEM_SUPPORT +#endif // AP_FILESYSTEM_FATFS_ENABLED || AP_FILESYSTEM_POSIX_ENABLED #if AP_PARAM_MAX_EMBEDDED_PARAM > 0 /*