From eb0f14f18dd438b8e94dca374b0eb38ec317bf4c Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 27 Jul 2022 12:54:10 -0600 Subject: [PATCH 1/3] Fix #1273, Remove stray terminators --- src/unit-tests/osfile-test/ut_osfile_test.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/unit-tests/osfile-test/ut_osfile_test.c b/src/unit-tests/osfile-test/ut_osfile_test.c index 37c951980..0c76b1fda 100644 --- a/src/unit-tests/osfile-test/ut_osfile_test.c +++ b/src/unit-tests/osfile-test/ut_osfile_test.c @@ -78,7 +78,6 @@ int32 UT_os_setup_fs() if (res != OS_SUCCESS) { UtPrintf("OS_mkfs() returns %d\n", (int)res); - ; goto UT_os_setup_fs_exit_tag; } @@ -86,7 +85,6 @@ int32 UT_os_setup_fs() if (res != OS_SUCCESS) { UtPrintf("OS_mount() returns %d\n", (int)res); - ; OS_rmfs(g_devName); goto UT_os_setup_fs_exit_tag; } From 942a1f67321ebe152dae7cd927add7879df0f714 Mon Sep 17 00:00:00 2001 From: "Jose F. Martinez Pedraza" Date: Mon, 1 Aug 2022 17:21:36 -0400 Subject: [PATCH 2/3] Fix #1244, Add RTEMS timebase callback wrapper --- src/os/rtems/src/os-impl-timebase.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/os/rtems/src/os-impl-timebase.c b/src/os/rtems/src/os-impl-timebase.c index f9a5b4a2f..a903e330d 100644 --- a/src/os/rtems/src/os-impl-timebase.c +++ b/src/os/rtems/src/os-impl-timebase.c @@ -286,6 +286,24 @@ void OS_UsecsToTicks(uint32 usecs, rtems_interval *ticks) /* The user may specify whether to use priority inheritance on mutexes via osconfig.h */ #define OSAL_TIMEBASE_MUTEX_ATTRIBS RTEMS_PRIORITY | RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY +/*---------------------------------------------------------------- + * + * Function: OS_TimeBase_CallbackThreadEntry + * + * Purpose: Local helper routine, not part of OSAL API. + * Wrapper function used by OS_TimeBaseCreate_Impl to + * convert the rtems_task_argument on newly created + * timebase task into an osal_id_t used by the + * OS_TimeBase_CallbackThread. + * + *-----------------------------------------------------------------*/ +static void OS_TimeBase_CallbackThreadEntry(rtems_task_argument arg) +{ + osal_id_t id; + id = OS_ObjectIdFromInteger(arg); + OS_TimeBase_CallbackThread(id); +} + /*---------------------------------------------------------------- * * Function: OS_TimeBaseCreate_Impl @@ -390,9 +408,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_CallbackThread, /* task entry point */ - (rtems_task_argument)r_name); /* passed argument */ + 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 */ if (rtems_sc != RTEMS_SUCCESSFUL) { From eed9ac830c2afdd126d535dddad95fe9a4e98020 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 4 Aug 2022 15:03:47 -0400 Subject: [PATCH 3/3] Bump to v7.0.0-rc4+dev103 --- README.md | 6 ++++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 14f4c0b62..5d3a43c4e 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ The autogenerated OSAL user's guide can be viewed at and + ### Development Build: v6.0.0-rc4+dev97 - Ensure address alignment of TCB for VxWorks 7 - See diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 4db9313f3..5ecefd0e6 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -34,7 +34,7 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 97 +#define OS_BUILD_NUMBER 103 #define OS_BUILD_BASELINE "v6.0.0-rc4" /*