Skip to content

Commit

Permalink
Merge pull request #1580 from skliper/fix1364-es_verify_errors
Browse files Browse the repository at this point in the history
Fix #1364, Update ES verify errors to match test
  • Loading branch information
astrogeco authored May 27, 2021
2 parents 176e3df + 251267a commit b7bfaba
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions modules/es/fsw/src/cfe_es_verify.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#endif

#if CFE_PLATFORM_ES_ER_LOG_ENTRIES < 1
#error CFE_PLATFORM_ES_ER_LOG_ENTRIES cannot be less than 10!
#error CFE_PLATFORM_ES_ER_LOG_ENTRIES cannot be less than 1!
#endif

#if CFE_PLATFORM_ES_SYSTEM_LOG_SIZE < 512
Expand Down Expand Up @@ -160,7 +160,7 @@
** Alignment of ES memory pool
*/
#if CFE_PLATFORM_ES_MEMPOOL_ALIGN_SIZE_MIN <= 0
#error CFE_PLATFORM_ES_MEMPOOL_ALIGN_SIZE_MIN cannot be 0!
#error CFE_PLATFORM_ES_MEMPOOL_ALIGN_SIZE_MIN cannot be less than or equal to 0!
#elif (CFE_PLATFORM_ES_MEMPOOL_ALIGN_SIZE_MIN & (CFE_PLATFORM_ES_MEMPOOL_ALIGN_SIZE_MIN - 1)) != 0
#error CFE_PLATFORM_ES_MEMPOOL_ALIGN_SIZE_MIN must be a power of 2!
#endif
Expand All @@ -169,15 +169,15 @@
** Intermediate ES Memory Pool Block Sizes
*/
#if CFE_PLATFORM_ES_MAX_BLOCK_SIZE < CFE_MISSION_SB_MAX_SB_MSG_SIZE
#error CFE_PLATFORM_ES_MAX_BLOCK_SIZE must be larger than CFE_MISSION_SB_MAX_SB_MSG_SIZE!
#error CFE_PLATFORM_ES_MAX_BLOCK_SIZE must be equal to or larger than CFE_MISSION_SB_MAX_SB_MSG_SIZE!
#endif

#if CFE_PLATFORM_ES_MAX_BLOCK_SIZE < CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE
#error CFE_PLATFORM_ES_MAX_BLOCK_SIZE must be larger than CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE!
#error CFE_PLATFORM_ES_MAX_BLOCK_SIZE must be equal to or larger than CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE!
#endif

#if CFE_PLATFORM_ES_MAX_BLOCK_SIZE < CFE_PLATFORM_TBL_MAX_DBL_TABLE_SIZE
#error CFE_PLATFORM_ES_MAX_BLOCK_SIZE must be larger than CFE_PLATFORM_TBL_MAX_DBL_TABLE_SIZE!
#error CFE_PLATFORM_ES_MAX_BLOCK_SIZE must be equal to or larger than CFE_PLATFORM_TBL_MAX_DBL_TABLE_SIZE!
#endif

#if CFE_PLATFORM_ES_MEM_BLOCK_SIZE_01 > CFE_PLATFORM_ES_MEM_BLOCK_SIZE_02
Expand Down

0 comments on commit b7bfaba

Please sign in to comment.