Merge pull request #1277 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev15
nasa · Aug 4, 2022 · 6e6afb4 · 6e6afb4
2 parents bafbede + eed9ac8
commit 6e6afb4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,12 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Changelog
 
+### Development Build: v6.0.0-rc4+dev103
+
+- Remove stray terminators
+- Add RTEMS timebase callback wrapper
+- See <https://github.com/nasa/osal/pull/1274> and <https://github.com/nasa/osal/pull/1276>
+
 ### Development Build: v6.0.0-rc4+dev97
 - Ensure address alignment of TCB for VxWorks 7
 - See <https://github.com/nasa/osal/pull/1272>

diff --git 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"
 
 /*

diff --git 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)
  {

diff --git a/src/unit-tests/osfile-test/ut_osfile_test.c b/src/unit-tests/osfile-test/ut_osfile_test.c
@@ -78,15 +78,13 @@ int32 UT_os_setup_fs()
  if (res != OS_SUCCESS)
  {
  UtPrintf("OS_mkfs() returns %d\n", (int)res);
- ;
  goto UT_os_setup_fs_exit_tag;
  }
 
  res = OS_mount(g_devName, g_mntName);
  if (res != OS_SUCCESS)
  {
  UtPrintf("OS_mount() returns %d\n", (int)res);
- ;
  OS_rmfs(g_devName);
  goto UT_os_setup_fs_exit_tag;
  }