-
Notifications
You must be signed in to change notification settings - Fork 219
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
osal Integration Candidate: 2020-11-24 #662
Merged
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
Adds typedefs for: - osal_priority_t - osal_stackptr_t - osal_index_t - osal_objtype_t - osal_blockcount_t Note that by using `uint8` as the priority type, all values are valid and it is no longer possible to pass a value which is out of range. Checks/tests for this are no longer valid and would cause compiler warnings.
Additional type corrections to avoid implicit sign and width conversions.
This should avoid any inconsistencies in the event that the memory address translates to a negative numeric value.
Fix #635, Reduce use of uint32, add more OSAL typedefs
Fix #559, Rename set force fail
astrogeco
added a commit
to astrogeco/osal
that referenced
this pull request
Dec 1, 2020
astrogeco
changed the title
Integration Candidate: 2020-11-24
osal Integration Candidate: 2020-11-24
Dec 1, 2020
Integration Candidate 2020-11-24
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Dec 3, 2020
Combines nasa/cFE#1027 nasa/osal#662 nasa/PSP#221 nasa/sample_app#113 nasa/sample_lib#38 nasa/sch_lab#58 nasa/tblCRCTool#25 Co-authored-by: Joseph Hickey <joseph.p.hickey@nasa.gov>
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
Fix #559, Refactoring UT_SetForceFail to UT_SetDefaultReturnValue
Fix #635, add typedefs for osal stack and priority
Fix #655, use 3 argument form of open
Fix #651, use unsigned types in VxWorks stack calculation
Fix #559, cleaning up Rebasing
Fix #586, add functional test of one shot timer
Testing performed
Expected behavior changes
PR #646 - Rename
UT_SetForceFail
toUT_SetDefaultReturnValue
since some functions that retain more than 1 value are not necessarily failingPR #653 - Add a 5th timer to TimerTest functional to test the one shot (zero-length time interval) case.
PR #654 - Ensure all APIs use the proper type. Sizes are now size_t; these will now be 64 bits on a 64 bit platform.
PR #656 - Fix build issue on VxWorks 6.9 by using the 3 argument form of
open()
. Passing0
as the mode solves the build issue. This parameter is ignored when not creating a file.PR #658 - The address calculations now use
unsigned long
instead oflong
to ensure that all rounding and base address adjustments behave the same way in the event that the addresses lie in the upper half of memory (i.e. start with a 1 bit) which would put it in the negative range of a long type.System(s) tested on
Ubuntu 18.04
Additional context
Part of nasa/cFS#158
Third party code
None
Contributor Info - All information REQUIRED for consideration of pull request
@zanzaben
@jphickey