Skip to content

Fix #1301, remove option for "osal_compatible"#1305

Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom
jphickey:fix-1301-resourceid-options
Apr 28, 2021
Merged

Fix #1301, remove option for "osal_compatible"#1305
astrogeco merged 1 commit intonasa:integration-candidatefrom
jphickey:fix-1301-resourceid-options

Conversation

@jphickey
Copy link
Contributor

Describe the contribution
Currently it is assumed/required that resource IDs follow the "osal compatible" pattern. Perhaps in a future version this could change, but for now it is simpler to just require this configuration, rather than having an option with only one choice.

This renames/moves the header file but the content is not fundamentally changed.

Fixes #1301

Testing performed
Build and sanity check CFE, confirm normal operation
Run all unit tests

Expected behavior changes
None

System(s) tested on
Ubuntu 20.04

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

Currently it is assumed/required that resource IDs follow the "osal compatible"
pattern.  Perhaps in a future version this could change, but for now it is
simpler to just require this configuration, rather than having an option
with only one choice.

This renames/moves the header file but the content is not fundamentally changed.
@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Apr 12, 2021
@skliper skliper added CCB:2021-04-14 and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Apr 14, 2021
@skliper
Copy link
Contributor

skliper commented Apr 14, 2021

CCB:2021-04-14 - APPROVED

@astrogeco astrogeco added the CCB:Approved Indicates code review and approval by community CCB label Apr 28, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate April 28, 2021 00:57
@astrogeco astrogeco merged commit 6a9e8c9 into nasa:integration-candidate Apr 28, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 28, 2021
nasa/cFE#1379, memory pool pointer type
nasa/cFE#1289, ES child task functional test
nasa/cFE#1289, typo in macro name
nasa/cFE#1286, Remove broken BUILDDIR reference
nasa/cFE#1305, remove option for "osal_compatible"
nasa/cFE#1374, CFE_SUCCESS constant type
nasa/cFE#1316, Remove Unused Error Codes
nasa/cFE#1370, better warning about malformed startup line
nasa/cFE#1373, check status of call to `CFE_ES_CDS_CachePreload`
nasa/cFE#1384, update documentation for `CFE_ES_DeleteCDS`
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 29, 2021
Combines:

nasa/cFE#1431
nasa/osal#975
nasa/sample_lib#61

Includes:

nasa/cFE#1379, memory pool pointer type
nasa/cFE#1289, ES child task functional test
nasa/cFE#1289, typo in macro name
nasa/cFE#1286, Remove broken BUILDDIR reference
nasa/cFE#1305, remove option for "osal_compatible"
nasa/cFE#1374, CFE_SUCCESS constant type
nasa/cFE#1316, Remove Unused Error Codes
nasa/cFE#1370, better warning about malformed startup line
nasa/cFE#1373, check status of call to `CFE_ES_CDS_CachePreload`
nasa/cFE#1384, update documentation for `CFE_ES_DeleteCDS`
nasa/cFE#1385, exception logic when app/task is not found
nasa/cFE#1372, error if alignment size not a power of two
nasa/cFE#1368, remove unneeded CFE_ES_SYSLOG_APPEND macro
nasa/cFE#1382, improve documentation for resourceID patterns
nasa/cFE#1371, assert `CFE_RESOURCEID_MAX` is a bitmask

nasa/osal#972, update documentation for read/write
nasa/osal#966, add "handler" feature to utassert stub API
nasa/osal#953, Adds local makefile and bundle/local unit test actions with coverage verification
nasa/osal#971, socket accept using incorrect record
nasa/osal#959, move async console option

nasa/sample_lib#60, replace direct ref to ArgPtr with macro
@jphickey jphickey deleted the fix-1301-resourceid-options branch May 14, 2021 14:23
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove cfe_resource_osal_compatible.h option and force use

3 participants