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

osal Integration Candidate: 2020-11-24 #662

Merged
merged 15 commits into from
Dec 2, 2020
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Dec 1, 2020

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 to UT_SetDefaultReturnValue since some functions that retain more than 1 value are not necessarily failing

PR #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(). Passing 0 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 of long 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

zanzaben and others added 9 commits November 13, 2020 14:42
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
astrogeco added a commit to astrogeco/osal that referenced this pull request Dec 1, 2020
@astrogeco astrogeco changed the title Integration Candidate: 2020-11-24 osal Integration Candidate: 2020-11-24 Dec 1, 2020
Integration Candidate 2020-11-24
@astrogeco astrogeco marked this pull request as ready for review December 2, 2020 14:30
@astrogeco astrogeco merged commit fa0cffa into main Dec 2, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Dec 3, 2020
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants