Merge pull request nasa#1369 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev39
dzbaker · Feb 16, 2023 · c1d6928 · c1d6928
2 parents 3105366 + 19e017a
commit c1d6928
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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>

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   191
+#define OS_BUILD_NUMBER   195
 #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
@@ -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)
             {