Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PSP Integration candidate: 2021-04-02 #288

Merged
merged 5 commits into from
Apr 2, 2021
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 2, 2021

Change Description and Behavior Impacts

PR #287

Fix #280, remove psp configdata global object

Removes unnecessary global config structure Target_PspConfigData and associated elements infavor of the new version API.

PR #283

Fix #281, cleanup memory range table

The mem pool stats TLM command now works on 64-bit Linux and sends out the expected telemetry packet.
Converts CFE_PSP_MemoryTable to internal object (instead of external) that should only be accessed via the PSP API. Replace uint32s with size_t. Use full range (SIZE_MAX) in the Linux/RTEMS implementation.

Testing

psp https://github.com/nasa/PSP/pull/288/checks
bundle https://github.com/nasa/cFS/pull/233/checks

Context

Part of nasa/cFS#233

Authors

@jphickey

jphickey and others added 3 commits March 29, 2021 14:30
A number of cleanup items related to the PSP memory range API

- Make the table itself an internal object - should only be accessed
via the PSP API.
- Update to use size_t instead of uint32
- Update the Linux/RTEMS implementation to use full range (SIZE_MAX).
This global config structure is not really necessary.  The original
intent was to allow dependents (e.g. CFE) to get vars at runtime but
keep them stored within PSP.  However for all those cases where CFE
needs PSP info, an API function is defined to get the info.  There
should not be any need to read this variable directly.
Fix #280, remove psp configdata global object
@astrogeco astrogeco merged commit 79b944b into main Apr 2, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 2, 2021
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CFE_PSP_MemValidateRange() always fails on 64-bit targets Remove "GLOBAL_PSP_CONFIGDATA" object
2 participants