# HG changeset patch # User Alexis Jeandet # Date 2018-10-30 08:41:43 # Node ID 56ae035bb062f5b5e3ed35424d7ed20a4ffb01a7 # Parent eb452cd0caf8f3354dcf575ec0e0413670624440 Removed last dead code function found and set FSW ver to 3.2.0.23 diff --git a/header/GscMemoryLPP.hpp b/header/GscMemoryLPP.hpp --- a/header/GscMemoryLPP.hpp +++ b/header/GscMemoryLPP.hpp @@ -44,7 +44,7 @@ #define COUNTER_MASK_IURF 0xffffc7ff // 1111 1111 1111 1111 1100 0111 1111 1111 volatile unsigned int *asr16Ptr = (volatile unsigned int *) ASR16_REG_ADDRESS; - +#ifdef ENABLE_DEAD_CODE static inline void flushCache() { /** @@ -57,6 +57,7 @@ static inline void flushCache() asm("flush"); } +#endif //*************************** // CCR Cache control register diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,7 +66,7 @@ option(FSW_Enable_Dead_Code "Enable dead set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE) set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE) set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE) -set(SW_VERSION_N4 "22" CACHE STRING "Choose N4 FSW Version." FORCE) +set(SW_VERSION_N4 "23" CACHE STRING "Choose N4 FSW Version." FORCE) if(FSW_verbose) add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)