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.

Sign up for GitHub

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

Jump to bottom

osal Integration candidate: Caelum-rc4+dev39 #1369

Merged
merged 3 commits into from
Feb 16, 2023
Merged

osal Integration candidate: Caelum-rc4+dev39 #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
454bd97
Fix #1366, removed cast that hid the bug at compile time
pepepr08 Aug 4, 2022
adf88ee
Merge pull request #1367 from pepepr08/fix1366-remove-timebase-cast
dzbaker Feb 16, 2023
19e017a
Bump to v6.0.0-rc4+dev195
dzbaker Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Development Build: v6.0.0-rc4+dev195
- removed cast that hid bug at compile time
- See <https://github.com/nasa/osal/pull/1367>

## Development Build: v6.0.0-rc4+dev191
- add doxygen for UT_ConfigureGenericStubReturnValue
- See <https://github.com/nasa/osal/pull/1362>
Expand Down
2 changes: 1 addition & 1 deletion src/os/inc/osapi-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/*
* Development Build Macro Definitions
*/
#define OS_BUILD_NUMBER 191
#define OS_BUILD_NUMBER 195
#define OS_BUILD_BASELINE "v6.0.0-rc4"

/*
Expand Down
6 changes: 3 additions & 3 deletions src/os/rtems/src/os-impl-timebase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token)
else
{
/* will place the task in 'ready for scheduling' state */
rtems_sc = rtems_task_start(local->handler_task, /*rtems task id*/
(rtems_task_entry)OS_TimeBase_CallbackThreadEntry, /* task entry point */
(rtems_task_argument)r_name); /* passed argument */
rtems_sc = rtems_task_start(local->handler_task, /* rtems task id */
OS_TimeBase_CallbackThreadEntry, /* task entry point */
(rtems_task_argument)r_name); /* passed argument */

if (rtems_sc != RTEMS_SUCCESSFUL)
{
Expand Down