Skip to content

Fix #1087, do not register RTOS timer for external sync#1091

Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom
jphickey:fix-1087-timebase-signal-reg
Jul 2, 2021
Merged

Fix #1087, do not register RTOS timer for external sync#1091
astrogeco merged 1 commit intonasa:integration-candidatefrom
jphickey:fix-1087-timebase-signal-reg

Conversation

@jphickey
Copy link
Contributor

Describe the contribution
Skip the registration of a timer in VxWorks when the assigned_signal is 0 (this indicates an external sync function is used).

Fixes #1087

Testing performed
Run time-base-api-test

Expected behavior changes
Test now passes

System(s) tested on
MCP750 / VxWorks 6.9

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

Skip the registration of a timer in VxWorks when the assigned_signal
is 0 (this indicates an external sync function is used).
@jphickey jphickey force-pushed the fix-1087-timebase-signal-reg branch from 1ab0329 to c8b9301 Compare June 25, 2021 20:14
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Jun 25, 2021
@skliper skliper added this to the 6.0.0 milestone Jun 28, 2021
@astrogeco
Copy link
Contributor

CCB:2021-06-30 APPROVED

@astrogeco astrogeco 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 Jun 30, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate July 2, 2021 19:01
@astrogeco astrogeco merged commit b671b7e into nasa:integration-candidate Jul 2, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Jul 2, 2021
**Combines:**

nasa/osal#1098

**Includes:**

nasa/osal#1081, add range to OS_TaskDelay checks

nasa/osal#1085, root task ID on RTEMS

nasa/osal#1090, increase timeout in network-api-test

nasa/osal#1091, avoid task delete during UtPrintf

nasa/osal#1093, increase UT symbol dump size limit

nasa/osal#1097, do not register RTOS timer for external sync

nasa/osal#1092, Add osal# prefix to Network API group
astrogeco added a commit to nasa/cFS that referenced this pull request Jul 7, 2021
**Combines:**

nasa/osal#1098

**Includes:**

nasa/osal#1081, add range to OS_TaskDelay checks

nasa/osal#1085, return OS_OBJECT_ID_UNDEFINED for root task ID on RTEMS

nasa/osal#1090, increase UT symbol dump size limit

nasa/osal#1091, do not register RTOS timer for external sync

nasa/osal#1093, avoid task delete during UtPrintf

nasa/osal#1097, Add osal prefix to Network API group

nasa/osal#1092, increase timeout in network-api-test
astrogeco added a commit to nasa/cFS that referenced this pull request Jul 7, 2021
**Combines**

nasa/cFE#1654, cfe v6.8.0-rc1+dev739
nasa/osal#1098, osal v5.1.0-rc1+dev564

**Includes**

nasa/cFE#1444, Change index type to resolve infinite loop warning
nasa/cFE#1653, Adding coverage for cfe_es_task.c
nasa/cFE#1638, Expand FS Header Functional tests.
nasa/cFE#1637, Complete coverage for cfe_es_start.c and cfe_es_syslog.c

nasa/osal#1081, add range to OS_TaskDelay checks
nasa/osal#1085, return OS_OBJECT_ID_UNDEFINED for root task ID on RTEMS
nasa/osal#1090, increase UT symbol dump size limit
nasa/osal#1091, do not register RTOS timer for external sync
nasa/osal#1093, avoid task delete during UtPrintf
nasa/osal#1097, Add osal prefix to Network API group
nasa/osal#1092, increase timeout in network-api-test

Co-authored-by: Jacob Hageman <[email protected]>
Co-authored-by: Joseph Hickey <[email protected]>
Co-authored-by: Alex Campbell <[email protected]>
Co-authored-by: Jose F Martinez Pedraza <[email protected]>
Co-authored-by: Himanshu <[email protected]>
@jphickey jphickey deleted the fix-1087-timebase-signal-reg branch August 3, 2021 15:19
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

CCB:Approved Indicates code review and approval by community CCB vxworks

Projects

None yet

Development

Successfully merging this pull request may close these issues.

VxWorks timebase still registers signal with RTOS when sync function is not NULL

4 participants