Fix #1273, remove PspConfig global object #1274
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skliper
approved these changes
Mar 31, 2021
jphickey
force-pushed
the
fix-1273-pspconfig
branch
from
a378409 to
e5e2953
Compare
|
Updated for whitespace/format .... |
jphickey
added
the
CCB:Ready
|
CCB:2021-03-31 APPROVED
|
|
@astrogeco @jphickey - can we get this in today? Should be included for code review. |
The `PspConfig` member is removed from the `GLOBAL_CONFIGDATA` object. Updates the only remaining ref to this object inside the CFE_PSP_VERSION macro to use the API function instead. This also updates the OSAL and CFE version print to _not_ depend on the global object too - OSAL becomes an API call and CFE can just use the macro directly because its the same library (itself) so no linking concern/issue.
jphickey
force-pushed
the
fix-1273-pspconfig
branch
from
e5e2953 to
9c4b36f
Compare
|
Rebased to resolve conflicts, should merge cleanly now. |
astrogeco
added
IC:2021-04-06
and removed
CCB:Ready
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
*Submodule ICs:* nasa/cFE#1279, nasa/PSP#288 *Submodule IC Contents:* nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object nasa/PSP#283 - Fix #281, cleanup memory range table
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
*Submodule ICs:* nasa/cFE#1279, nasa/PSP#288 *Contents:* nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object nasa/PSP#283 - Fix #281, cleanup memory range table
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 2, 2021
*Submodule ICs:* nasa/cFE#1279, nasa/PSP#288 *Contents:* nasa/cFE#1274 - Fix #1273, remove PspConfig global object nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe nasa/PSP#287 - Fix #280, remove psp configdata global object nasa/PSP#283 - Fix #281, cleanup memory range table
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the contribution
The
PspConfigmember is removed from theGLOBAL_CONFIGDATAobject.Updates the only remaining ref to this object inside the CFE_PSP_VERSION macro to use the API function instead.
This also updates the OSAL and CFE version print to not depend on the global object too - OSAL becomes an API call and CFE can just use the macro directly because its the same library (itself) so no linking concern/issue.
Fixes #1273
Testing performed
Build and sanity check CFE, run all unit tests
Expected behavior changes
None
System(s) tested on
Ubuntu 20.04
Additional context
Co-Dependent with nasa/PSP#280
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.