Skip to content

Commit

Permalink
Merge pull request #590 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
Integration Candidate: 2020-09-02
  • Loading branch information
yammajamma committed Sep 9, 2020
2 parents 6720437 + 844d9f7 commit c3b1398
Show file tree
Hide file tree
Showing 107 changed files with 1,694 additions and 1,303 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF

## Version History

### Development Build: 5.1.0-rc1+dev27

- Introduces a new typedef, osal_id_t, in common_types.h, which should be used to represent an OSAL ID. All API structures/functions are updated to use this typedef in place of the uint32 type wherever it actually refers to an OSAL ID.
- Fail tests on startup or tear down failures. These are failures, just a different severity (likely mean the test didn't work as expected and needs to be fixed).
- Max timer create test was using OS_MAX_TIMERS (the limit for adding timers to a time base), but creating timers is limited by OS_MAX_TIMEBASES since the create adds a new time base.
- HOTFIX 20200902 - Fix documentation warnings in OSAL.
- HOTFIX 20200902 - Hide the call graph on utility functions.
- See <https://github.com/nasa/osal/pull/590>

### Development Build: 5.1.0-rc1+dev16

- In the next major OSAL release, this code will be no longer supported at all. It should be removed early in the cycle to avoid needing to maintain this compatibility code. This code was already conditional on the OSAL_OMIT_DEPRECATED flag and as such the CCB has already tested/verified running the code in this configuration as part of CI scripts. After this change, the build should be equivalent to the result of building with OMIT_DEPRECATED=true.
Expand Down
5 changes: 5 additions & 0 deletions src/os/inc/common_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@
typedef size_t cpusize;
typedef ptrdiff_t cpudiff;

/**
* A type to be used for OSAL resource identifiers.
*/
typedef uint32_t osal_id_t;



#ifndef NULL /* pointer to nothing */
Expand Down
Loading

0 comments on commit c3b1398

Please sign in to comment.