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: 2021-04-20 #967

Merged
merged 5 commits into from
Apr 22, 2021
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 21, 2021

Description

PR #950

Fix #932 - changed parameter names to avoid collisions

Renames access as access_mode in osapi-file.h.
Renames time as TimeSp in os-impl-posix-gettime.c.

PR #946

Fix #945, shell implementation on posix and rtems

Deletes the broken RTEMS os-impl-shell.c file so so OSAL builds with OSAL_CONFIG_INCLUDE_SHELL=true. RTEMS will always report OS_ERR_NOT_IMPLEMENTED.

Context

Part of nasa/cFS#248

Testing

osal Checks https://github.com/nasa/osal/pull/967/checks
cFS Bundle Checks https://github.com/nasa/cFS/pull/248/checks

Authors

@jphickey
@skliper

skliper and others added 4 commits April 7, 2021 15:22
Due to other changes the shell implementation on RTEMS and POSIX failed
to build under certain configurations.  This fixes and verifies the
shell functions as expected.
Fix #932, Eliminate time and access name collisions with VxWorks
Fix #945, shell implementation on posix and rtems
@astrogeco astrogeco changed the title osal Integration candidate: 2021-04-27 osal Integration candidate: 2021-04-20 Apr 22, 2021
@astrogeco astrogeco marked this pull request as ready for review April 22, 2021 13:34
@astrogeco astrogeco merged commit afb5f7b into main Apr 22, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 22, 2021
Combines:

nasa/cFE#1406
nasa/osal#967
nasa/cFS-GroundSystem#178

Includes:

nasa/cFE#1290, Split interface and implementation modules
nasa/cFE#1376, add docs to CFE_ES_RegisterCDS() regarding clearing
nasa/cFE#1292, Remove testrunner and convert testcase to app
cfe-IC:2021-04-20, HOTFIX: Always build cfe_assert.

nasa/osal#950, Eliminate time and access name collisions with VxWorks
nasa/osal#946, Fix Shell implementation on posix and rtems

nasa/cFS-GroundSystem#174, update executable name and version in setup.py
nasa/cFS-GroundSystem#175, Add executable install guide
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 22, 2021
Combines:

nasa/cFE#1406
nasa/osal#967
nasa/cFS-GroundSystem#178

Includes:

nasa/cFE#1290, Split interface and implementation modules
nasa/cFE#1376, add docs to CFE_ES_RegisterCDS() regarding clearing
nasa/cFE#1292, Remove testrunner and convert testcase to app
cfe-IC:2021-04-20, HOTFIX: Always build cfe_assert.

nasa/osal#950, Eliminate time and access name collisions with VxWorks
nasa/osal#946, Fix Shell implementation on posix and rtems

nasa/cFS-GroundSystem#174, update executable name and version in setup.py
nasa/cFS-GroundSystem#175, Add executable install guide
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
jphickey added a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Startup script reflects names fixed in SAMPLE_APP and SAMPLE_LIB.
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RTEMS fails to build with shell enabled Non-distinct identifiers
3 participants