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 #1244, Add RTEMS timebase callback wrapper #1276

Closed
wants to merge 2 commits into from

Conversation

pepepr08
Copy link
Contributor

@pepepr08 pepepr08 commented Aug 1, 2022

Checklist (Please check before submitting)

Describe the contribution
Fixes #1244 by creating a wrapper function to convert timebase callback task argument from rtems_task_argument into osal_id_t

Testing performed
Steps taken to test the contribution:

  1. Built with OMIT_DEPRECATED = true and MISSION_RESOURCEID_MODE = "STRICT" for RTEMS/GR740
  2. Run and verify successful cFS init

System(s) tested on

  • Hardware: GR740
  • OS: RTEMS 5
  • Versions: Draco-rc2 +

Contributor Info - All information REQUIRED for consideration of pull request
Jose F Martinez Pedraza / NASA GSFC code 582

@pepepr08 pepepr08 added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Aug 1, 2022
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved with minor update request (remove cast)

src/os/rtems/src/os-impl-timebase.c Outdated Show resolved Hide resolved
@dzbaker
Copy link
Collaborator

dzbaker commented Aug 3, 2022

CCB 3 Aug 2022: Approved pending removal of rtems_task_entry typecast.

@dzbaker dzbaker added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Aug 3, 2022
dzbaker added a commit that referenced this pull request Aug 4, 2022
Fix #1244, Add RTEMS timebase callback wrapper
dzbaker added a commit to nasa/cFS that referenced this pull request Aug 4, 2022
*Combines:*

cfe v7.0.0-rc4+dev157
osal v6.0.0-rc4+dev103

*Includes*
- nasa/cFE#2129, use correct loop var in add_cfe_app_dependency
- nasa/cFE#2117, Automatic suppression of flooding events
- nasa/cFE#2126, Remove stray TODO in UT
- nasa/osal#1274, Remove stray terminators
- nasa/osal#1276, Add RTEMS timebase callback wrapper

Co-authored by: Joseph Hickey  <jphickey@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Jose Martinez Pedraza <pepepr08@users.noreply.github.com>
@dzbaker dzbaker mentioned this pull request Aug 4, 2022
2 tasks
dzbaker added a commit to nasa/cFS that referenced this pull request Aug 4, 2022
*Combines:*

cfe v7.0.0-rc4+dev157
osal v6.0.0-rc4+dev103

*Includes*
- nasa/cFE#2129, use correct loop var in add_cfe_app_dependency
- nasa/cFE#2117, Automatic suppression of flooding events
- nasa/cFE#2126, Remove stray TODO in UT
- nasa/osal#1274, Remove stray terminators
- nasa/osal#1276, Add RTEMS timebase callback wrapper

Co-authored by: Joseph Hickey  <jphickey@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Jose Martinez Pedraza <pepepr08@users.noreply.github.com>
@dzbaker
Copy link
Collaborator

dzbaker commented Aug 4, 2022

Merged with PR #1277

@dzbaker dzbaker closed this Aug 4, 2022
@skliper skliper added this to the Draco milestone Sep 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB draco-rc3
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Strict-type errors/exception when creating TimeBase callback on RTEMS during cFS init
4 participants