Fix #2507, add EDS cmake hooks #2511
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
| @@ -126,6 +126,78 @@ | |||
| */ | |||
| extern CFE_StaticModuleLoadEntry_t CFE_PSP_MODULE_LIST[]; | |||
|
|
|||
| #ifdef CFE_EDS_ENABLED_BUILD | |||
Check notice
Code scanning / CodeQL
Conditional compilation Note
| * non-const pointer gets set NULL. There are no "write" operations | ||
| * in this mode -- registration and de-registration is not necessary. | ||
| */ | ||
| #ifdef CFE_EDS_LINK_MODE_GLOBAL |
Check notice
Code scanning / CodeQL
Conditional compilation Note
| * Dynamic (non-const) runtime EDS database object | ||
| * This is filled in as additional EDS datasheet objects are registered | ||
| */ | ||
| #ifdef CFE_EDS_LINK_MODE_LOCAL |
Check notice
Code scanning / CodeQL
Conditional compilation Note
| * For all of these DB objects, use NULL if not defined. | ||
| * This covers the case where EDS is not being used. | ||
| */ | ||
| #ifndef CFE_NONCONST_EDS_DB_PTR |
Check notice
Code scanning / CodeQL
Conditional compilation Note
| * Note that the non-const object can be used as a const object, | ||
| * but not the other way around. This can also be NULL. | ||
| */ | ||
| #ifndef CFE_CONST_EDS_DB_PTR |
Check notice
Code scanning / CodeQL
Conditional compilation Note
| * of the software bus messages. This can also be NULL if | ||
| * EDS is not being used. | ||
| */ | ||
| #ifndef CFE_SB_INTF_DB_PTR |
Check notice
Code scanning / CodeQL
Conditional compilation Note
Adds CFE_EDS_ENABLED_BUILD option at the top level, along with other logic that is tied in only when this is set TRUE. By default it is set to FALSE, so it does not change any existing workflows yet. Also added are the keys for two configuration values for reflecting EDS DB objects (pointers) and some minor cleanup.
76ee213
to
350f57e
Compare
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Feb 2, 2024
*Combines:* cFE equuleus-rc1+dev90 ci_lab equuleus-rc1+dev57 **Includes:** *cFE* - nasa/cFE#2510 - nasa/cFE#2511 *osal* - nasa/ci_lab#174 Co-authored by: Joseph Hickey <[email protected]>
This was referenced Feb 2, 2024
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Feb 2, 2024
*Combines:* cFE equuleus-rc1+dev90 ci_lab equuleus-rc1+dev57 **Includes:** *cFE* - nasa/cFE#2510 - nasa/cFE#2511 *osal* - nasa/ci_lab#174 Co-authored by: Joseph Hickey <[email protected]>
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.
Checklist (Please check before submitting)
Describe the contribution
Adds CFE_EDS_ENABLED_BUILD option at the top level, along with other logic that is tied in only when this is set TRUE.
By default it is set to FALSE, so it does not change any existing workflows yet.
Also added are the keys for two configuration values for reflecting EDS DB objects (pointers) and some minor cleanup.
Fixes #2507
Testing performed
Build CFE and run all tests
Expected behavior changes
None when using defaults (EDS=OFF). All mods are behind the switch.
System(s) tested on
Debian
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.