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

Fix #615, RTEMS build issues #616

Merged
merged 1 commit into from
Oct 5, 2020

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Oct 2, 2020

Describe the contribution

Correct issues involving recent OS_Milli2Ticks change.

Note - for OS_TaskDelay it is important that this doesn't degrade into a no-op. So if OS_Milli2Ticks fails here, this returns the
error but still also does a non-zero delay.

Testing performed
Build and sanity check CFE under RTEMS
Run all unit tests

Expected behavior changes
Builds and runs correctly

System(s) tested on
RTEMS 4.11.3 + pc686 BSP target (QEMU) using Ubuntu 20.04 build host

Additional context
Includes the typo fix in #614 plus others.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Correct issues involving recent OS_Milli2Ticks change.

Note - for OS_TaskDelay it is important that this doesn't degrade
into a no-op.  So if OS_Milli2Ticks fails here, this returns the
error but still also does a non-zero delay.
@jphickey
Copy link
Contributor Author

jphickey commented Oct 2, 2020

Suggesting fast-track as the main branch currently fails to build for RTEMS.

@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Oct 2, 2020
@astrogeco
Copy link
Contributor

@acudmore can you take a look?

@astrogeco astrogeco changed the base branch from main to integration-candidate October 5, 2020 20:59
@astrogeco astrogeco merged commit 9f0975c into nasa:integration-candidate Oct 5, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Oct 5, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Oct 6, 2020
Combines 
- nasa/cFE#936
- nasa/osal#612

*** 

* Add osal#541

* Add cfe#898

* Add cfe#925

* Add cfe#917

* Add cFE#899

* Add nasa/cFE#888

* Add CFE hotfix for documentation link warnings

* Add FastTracked nasa/osal#616

* Set submodules to main for IC-2020-10-07

Co-authored-by: Joseph Hickey <joseph.p.hickey@nasa.gov>
@astrogeco astrogeco linked an issue Oct 6, 2020 that may be closed by this pull request
@astrogeco astrogeco removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Oct 7, 2020
@jphickey jphickey deleted the fix-615-rtems-build branch December 3, 2020 17:26
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Typo in RTEMS binsem.c Variable Name
3 participants