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

cFE Integration candidate: Caelum-rc4+dev43 #2257

Merged
merged 3 commits into from
Mar 17, 2023
Merged

Conversation

dzbaker
Copy link
Collaborator

@dzbaker dzbaker commented Mar 16, 2023

Checklist (Please check before submitting)

Describe the contribution

Testing performed
cFS Bundle Checks
cFE Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey

jphickey and others added 3 commits March 14, 2023 18:06
The "CFE_ES_MemAddress_t" and "CFE_ES_MemOffset_t" types were intended
to provide a path for easily upgrading the CMD/TLM structs from 32-bit
to 64-bit memory addresses.  However, this type was a bit overused and
in some of those use-cases (e.g. in TBL header) it assumed that the type
was 32-bits during the byte swap ops.  As a result, the type could not
be changed to 64 bits as intended.

This reverts those cases in TBL back to uint32 (meaning that tables will
still be limited to 32 bit sizes, even on 64 bit CPUs) but otherwise the
addresses and sizes in ES/SB telemetry can grow to 64 bits as intended.

For unit tests, correct operation depends on the availablily of an updated
test macro that can compare integers as "size_t" type. (as opposed to
uint32).
Fix #2240, improve 64-bit memory address handling in CMD/TLM
@dzbaker dzbaker merged commit 7c03369 into main Mar 17, 2023
@dmknutsen dmknutsen added this to the Equuleus milestone May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants