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

Integration Candidate: 2020-04-15 #433

Merged
merged 18 commits into from
Apr 27, 2020
Merged

Integration Candidate: 2020-04-15 #433

merged 18 commits into from
Apr 27, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 21, 2020

Describe the contribution
Fixes #413, #88, #12, #390, #392, #407, #368, #366, #354, and #432

Testing performed
See PRs
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/162280689

Expected behavior changes

  1. PR Fix #88, Add test for name too long and update comments  #398 - Coverage test added to OS_TimerCreate for OS_ERR_NAME_TOO_LONG.
    Updated comments related to sizing includes null terminator for:
    OS_MAX_API_NAME, OS_MAX_PATH_LEN, OS_BUFFER_SIZE
  2. PR Fix #12, Comment update to correct for microseconds not always rounding up + a… #406 - Updated comments in ostimer.c to reflect what the code is actually doing.
    Added debug message if microsecs per sec value does not equal 1000000.
  3. PR Fix #390, #392, osal select API unit tests and fixes #409 - Externalizes enum for SelectSingle, ensures that pointers passed to SelectFd...() APIs are not null, ensures that pointer to SelectSingle is not null.
  4. PR Fix #407, Resolve doxygen warnings for main doc #411 - Removes a duplicate reference doxygen warned about
  5. PR Fix #368, Deprecate os_fs_err_name_t #414 - None
  6. PR Fix #366, Deprecated exception handling APIs #415 - None
  7. PR Fix #354, Shell related API separated for optional implementation #418 - Command to run in shell and output to fill will fail with default (not implemented) setting. Open issue to resolve is Separate execute in shell functionality from core cFE service cFE#484
  8. PR Fix #432, Infer OSAL_SYSTEM_OSTYPE from OSAL_SYSTEM_BSPTYPE #436 - No FSW affected, only build script. Also fully backward compatible with old configs. Builds successfully using the inferred OS when only OSAL_SYSTEM_BSPTYPE is set (not OSAL_SYSTEM_OSTYPE). Generates a warning when OSAL_SYSTEM_BSPTYPE and OSAL_SYSTEM_OSTYPE are both set but are mismatched. Confirmed this works by intentionally mismatching in a config.

System(s) tested on

  • Hardware: [e.g. PC, SP0, MCP750]
  • OS: [e.g. Ubuntu 18.04, RTEMS 4.11, VxWorks 6.9]
  • Versions: [e.g. cFE 6.6, OSAL 4.2, PSP 1.3 for mcp750, any related apps or tools]

Additional context
Part of nasa/cFS#70

Contributor Info - All information REQUIRED for consideration of pull request
Chris D. Knight, NASA-ARC
Leor Bleir, NASA-GSFC
Daniel Knutsen, NASA-GSFC
Jacob Hageman, NASA-GSFC
Joseph Hickey, Vantage Systems, Inc.

astrogeco and others added 5 commits April 22, 2020 13:11
Fix #354, Shell related API separated for optional implementation
The OSAL_SYSTEM_BSPTYPE specification by itself is enough to
build OSAL, as it implies a specific OS layer.

However, if OSAL_SYSTEM_OSTYPE is explicitly specified, it is used,
but will generate a warning if it is different than the OS layer
implied by the BSP, as there could be reasons for doing this
during development.
Never fully implemented and more appropriate
in PSP layer due to platform dependencies
Fix #366, Deprecated exception handling APIs
Fix #432, Infer OSAL_SYSTEM_OSTYPE from OSAL_SYSTEM_BSPTYPE
@astrogeco astrogeco merged commit b27c73b into master Apr 27, 2020
@skliper skliper added this to the 5.1.0 milestone Jun 1, 2020
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Fix nasa#433, Release Prep
Document and copyright header changes only
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment