Merge pull request #1279 from nasa/integration-candidate

cFE Integration candidate: 2021-04-02

README.md

@@ -10,6 +10,12 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
 
 ## Version History
 
+### Development Build: v6.8.0-rc1+dev490
+
+- Removes `PspConfig` member from the `GLOBAL_CONFIGDATA` object. Updates the only remaining reference to this object inside the CFE_PSP_VERSION and uses the new Version API instead. Updates the OSAL version print to use the version API call and CFE uses the macro directly.
+- Replaces duplicate mention of the removed `CFE_SB_ZeroCopyGetPtr` with the correct removal target of `CFE_SB_ZeroCopyReleasePtr`
+- See <https://github.com/nasa/cFE/pull/1279> and <https://github.com/nasa/cFS/pull/233>
+
 ### Development Build: v6.8.0-rc1+dev484
 
 - Removes cases in `cfe_es_apps.c` and `cfe_tbl_internal.c` that could never hit the alternate condition since the condition was already checked
@@ -26,7 +32,7 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
 - Moves the invocation of `CFE_PSP_AttachExceptions()` from the registration function to the pre-entry function and removes all references to task registration in code, docs, and tests. **This API change affects cFS apps.**
 - Renames `CFE_TestRunner_AppMain` as `CFE_TR_AppMain` so it is less than 20 characters long. Updates App file names in documentation for `cfe_es_startup.scr`.
 - Replace the call to `CFE_SB_MessageStringGet()` with the new filename-aware function `CFE_FS_ParseInputFileName()` for commands that contain file names like `CFE_ES_StopPerfDataCmd`. The default pathname/extension logic is now applied here too and only a "basename" is strictly necessary, although if a full/absolute path is given, it will be used as is.
-- Removes the now-unnecessary `CFE_SB_ZeroCopyHandle_t` type and all APIs that refer or require it .Replaces `CFE_SB_ZeroCopyGetPtr()` and `CFE_SB_ZeroCopyGetPtr()` with two new simplified functions `CFE_SB_AllocateMessageBuffer()` and `CFE_SB_ReleaseMessageBuffer()` , respectively.  These new functions do not use a separate handle. Updates the `CFE_SB_TransmitBuffer()` API to also remove the handle. Does affect public APIs.
+- Removes the now-unnecessary `CFE_SB_ZeroCopyHandle_t` type and all APIs that refer or require it .Replaces `CFE_SB_ZeroCopyGetPtr()` and `CFE_SB_ZeroCopyReleasePtr()` with two new simplified functions `CFE_SB_AllocateMessageBuffer()` and `CFE_SB_ReleaseMessageBuffer()` , respectively.  These new functions do not use a separate handle. Updates the `CFE_SB_TransmitBuffer()` API to also remove the handle. **This breaks public APIs**.
 - Internal cleanup localized to ES implementation. Consolidate all ES global variables under the `CFE_ES_Global` struct. Removes the separate `CFE_ES_TaskData` and some random pointers that were stored at global scope. Adjusts all references to the deprecated items accordingly (search and replace).
 - Adds PSP version info to ES Housekeeping TLM messages. Changes both PSP and OSAL version info assignments on HK TLM to use the new version info API.
 - Fixes check for "NumBuckets" member to use `<=` instead of `<`. `CFE_ES_GenPoolValidateState()` now returns `true` if using the max number of buckets (17 by default) and the pool structure using max value will correctly validate

cmake/target/inc/target_config.h

@@ -32,7 +32,6 @@
 #define TARGET_CONFIG_H
 
 #include "common_types.h"
-#include "cfe_psp_configdata.h"
 
 /**
  * Prototype for the main system entry function implemented in CFE ES
@@ -191,7 +190,6 @@ typedef const struct
     const char *Default_CoreFilename;    /**< Default file name for CFE core executable/library */
 
     Target_CfeConfigData *CfeConfig; /**< CFE configuration sub-structure */
-    Target_PspConfigData *PspConfig; /**< PSP configuration sub-structure */
     CFE_StaticModuleLoadEntry_t
         *PspModuleList; /**< List of PSP modules (API structures) statically linked into the core EXE */
 

cmake/target/src/target_config.c

@@ -174,7 +174,6 @@ Target_ConfigData GLOBAL_CONFIGDATA = {
     .Default_ModuleExtension = CFE_DEFAULT_MODULE_EXTENSION,
     .Default_CoreFilename    = CFE_DEFAULT_CORE_FILENAME,
     .CfeConfig               = &GLOBAL_CFE_CONFIGDATA,
-    .PspConfig               = &GLOBAL_PSP_CONFIGDATA,
     .PspModuleList           = CFE_PSP_MODULE_LIST,
     .BuildEnvironment        = CFE_BUILD_ENV_TABLE,
     .ModuleVersionList       = CFE_MODULE_VERSION_TABLE,

modules/core_api/fsw/inc/cfe_version.h

@@ -28,7 +28,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER 484 /*!< Development Build: Number of commits since baseline */
+#define CFE_BUILD_NUMBER 490 /*!< Development Build: Number of commits since baseline */
 #define CFE_BUILD_BASELINE                                                                    \
     "v6.8.0-rc1" /*!< Development Build: git tag that is the base for the current development \
                   */

modules/es/fsw/src/cfe_es_task.c

@@ -465,10 +465,10 @@ int32 CFE_ES_TaskInit(void)
         return (Status);
     }
 
-    Status = CFE_EVS_SendEvent(CFE_ES_INITSTATS_INF_EID, CFE_EVS_EventType_INFORMATION,
-                               "cFS Versions: cfe %s, osal %s, psp %s. cFE chksm %d", GLOBAL_CONFIGDATA.CfeVersion,
-                               GLOBAL_CONFIGDATA.OsalVersion, CFE_PSP_VERSION,
-                               (int)CFE_ES_Global.TaskData.HkPacket.Payload.CFECoreChecksum);
+    Status =
+        CFE_EVS_SendEvent(CFE_ES_INITSTATS_INF_EID, CFE_EVS_EventType_INFORMATION,
+                          "cFS Versions: cfe %s, osal %s, psp %s. cFE chksm %d", CFE_SRC_VERSION, OS_GetVersionString(),
+                          CFE_PSP_GetVersionString(), (int)CFE_ES_Global.TaskData.HkPacket.Payload.CFECoreChecksum);
 
     if (Status != CFE_SUCCESS)
     {
@@ -847,8 +847,8 @@ int32 CFE_ES_NoopCmd(const CFE_ES_NoopCmd_t *Cmd)
     CFE_ES_Global.TaskData.CommandCounter++;
 
     CFE_EVS_SendEvent(CFE_ES_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION,
-                      "No-op command:\n cFS Versions: cfe %s, osal %s, psp %s", GLOBAL_CONFIGDATA.CfeVersion,
-                      GLOBAL_CONFIGDATA.OsalVersion, CFE_PSP_VERSION);
+                      "No-op command:\n cFS Versions: cfe %s, osal %s, psp %s", CFE_SRC_VERSION, OS_GetVersionString(),
+                      CFE_PSP_GetVersionString());
 
     return CFE_SUCCESS;
 } /* End of CFE_ES_NoopCmd() */