Fix nasa#795, Remove legacy time header format support

cmake/sample_defs/sample_mission_cfg.h

@@ -67,26 +67,6 @@
 #undef MESSAGE_FORMAT_IS_CCSDS_VER_2
 
 
-
-/** \name Packet timestamp format identifiers */
-/** \{ */
-#define CFE_MISSION_SB_TIME_32_16_SUBS   1  /**< \brief 32 bits seconds + 16 bits subseconds (units = 2^^-16)  */
-#define CFE_MISSION_SB_TIME_32_32_SUBS   2  /**< \brief 32 bits seconds + 32 bits subseconds (units = 2^^-32)  */
-#define CFE_MISSION_SB_TIME_32_32_M_20   3  /**< \brief 32 bits seconds + 20 bits microsecs + 12 bits reserved */
-/** \} */
-
-/**
-**  \cfemissioncfg Packet Timestamp Format Selection
-**
-**  \par Description:
-**      Defines the size, format and contents of the telemetry packet timestamp.
-**
-**  \par Limits
-**      Must be defined as one of the supported formats listed above
-*/
-#define CFE_MISSION_SB_PACKET_TIME_FORMAT  CFE_MISSION_SB_TIME_32_16_SUBS
-
-
 /**
 **  \cfesbcfg Maximum SB Message Size
 **
@@ -699,10 +679,6 @@
 #ifndef CFE_OMIT_DEPRECATED_6_6
 
 #define CFE_SPACECRAFT_ID           CFE_MISSION_SPACECRAFT_ID
-#define CFE_SB_TIME_32_16_SUBS      CFE_MISSION_SB_TIME_32_16_SUBS
-#define CFE_SB_TIME_32_32_SUBS      CFE_MISSION_SB_TIME_32_32_SUBS
-#define CFE_SB_TIME_32_32_M_20      CFE_MISSION_SB_TIME_32_32_M_20
-#define CFE_SB_PACKET_TIME_FORMAT   CFE_MISSION_SB_PACKET_TIME_FORMAT
 #define CFE_SB_MAX_SB_MSG_SIZE      CFE_MISSION_SB_MAX_SB_MSG_SIZE
 #define CFE_TIME_CFG_DEFAULT_TAI    CFE_MISSION_TIME_CFG_DEFAULT_TAI
 #define CFE_TIME_CFG_DEFAULT_UTC    CFE_MISSION_TIME_CFG_DEFAULT_UTC

fsw/cfe-core/src/sb/cfe_sb_verify.h

@@ -80,12 +80,9 @@
     #error CFE_PLATFORM_SB_BUF_MEMORY_BYTES cannot be greater than UINT32_MAX (4 Gigabytes)!
 #endif
 
-#ifndef CFE_MISSION_SB_PACKET_TIME_FORMAT
-    #error CFE_MISSION_SB_PACKET_TIME_FORMAT must be defined!
-#elif ((CFE_MISSION_SB_PACKET_TIME_FORMAT != CFE_MISSION_SB_TIME_32_16_SUBS) && \
-       (CFE_MISSION_SB_PACKET_TIME_FORMAT != CFE_MISSION_SB_TIME_32_32_SUBS) && \
-       (CFE_MISSION_SB_PACKET_TIME_FORMAT != CFE_MISSION_SB_TIME_32_32_M_20))
-    #error CFE_MISSION_SB_PACKET_TIME_FORMAT must be CFE_MISSION_SB_TIME_32_16_SUBS or CFE_MISSION_SB_TIME_32_32_SUBS or CFE_MISSION_SB_TIME_32_32_M_20!
+#if ((CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_32_SUBS) || \
+     (CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_32_M_20))
+    #error Legacy CFE_MISSION_SB_PACKET_TIME_FORMAT implementations no longer supported in core
 #endif
 
 #if CFE_MISSION_SB_MAX_SB_MSG_SIZE < 6

modules/msg/CMakeLists.txt

@@ -21,7 +21,7 @@ set(${DEP}_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_msgid_shared.c
     ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_sechdr_checksum.c
     ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_sechdr_fc.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_sechdr_time_old.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_sechdr_time.c
 )
 
 # Source selection for if CCSDS extended header is included, and MsgId version use

modules/msg/mission_inc/default_cfe_msg_sechdr.h

@@ -38,22 +38,6 @@
  * Defines
  */
 
-/* These go away w/ single framework implementation */
-/* CCSDS_TIME_SIZE is specific to the selected CFE_SB time format */
-#if (CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_16_SUBS)
-/* 32 bits seconds + 16 bits subseconds */
-#define CCSDS_TIME_SIZE 6
-#elif (CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_32_SUBS)
-/* 32 bits seconds + 32 bits subseconds */
-#define CCSDS_TIME_SIZE 8
-#elif (CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_32_M_20)
-/* 32 bits seconds + 20 bits microsecs + 12 bits reserved */
-#define CCSDS_TIME_SIZE 8
-#else
-/* unknown format */
-#error unable to define CCSDS_TIME_SIZE!
-#endif
-
 /*
  * Type Definitions
  */
@@ -86,7 +70,7 @@ typedef struct
 typedef struct
 {
 
-    uint8 Time[CCSDS_TIME_SIZE]; /**< \brief Time sized for selected format */
+    uint8 Time[6]; /**< \brief Time, big endian: 4 byte seconds, 2 byte subseconds */
 
 } CFE_MSG_TelemetrySecondaryHeader_t;