From 0857ea80fdb7775d334c44cb94d9dcba4374f6a2 Mon Sep 17 00:00:00 2001 From: Avi Date: Fri, 7 Oct 2022 10:24:53 +1000 Subject: [PATCH 1/6] Fix #1305, Stop empty function catching CI workflow format checks --- src/tests/osal-core-test/osal-core-test.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tests/osal-core-test/osal-core-test.c b/src/tests/osal-core-test/osal-core-test.c index 1559d9bf2..a6b475874 100644 --- a/src/tests/osal-core-test/osal-core-test.c +++ b/src/tests/osal-core-test/osal-core-test.c @@ -118,9 +118,7 @@ void task_generic_no_exit(void) /* **************** A TASK THAT EXITS ITSELF **************************** */ -void task_generic_with_exit(void) -{ -} /* end task_0 */ +void task_generic_with_exit(void) {} typedef struct { From 9f87575f6220f846c6d300eae400fdf7dc4a4af4 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 10 Oct 2022 09:41:58 -0400 Subject: [PATCH 2/6] Fix #1307, Add time conversion reciprocal functions Adds the following APIs which are direct reciprocals of the existing time conversion functions: OS_time_t OS_TimeFromTotalSeconds(int64 tm) OS_time_t OS_TimeFromTotalMilliseconds(int64 tm) OS_time_t OS_TimeFromTotalMicroseconds(int64 tm) OS_time_t OS_TimeFromTotalNanoseconds(int64 tm) --- src/os/inc/osapi-clock.h | 75 +++++++++++++++++++ .../shared/src/coveragetest-clock.c | 13 ++++ 2 files changed, 88 insertions(+) diff --git a/src/os/inc/osapi-clock.h b/src/os/inc/osapi-clock.h index 48c6cb584..d41291daf 100644 --- a/src/os/inc/osapi-clock.h +++ b/src/os/inc/osapi-clock.h @@ -123,6 +123,7 @@ int32 OS_SetLocalTime(const OS_time_t *time_struct); * structure was defined with separate seconds/microseconds fields. * * @sa OS_TimeGetMicrosecondsPart() + * @sa OS_TimeFromTotalSeconds() * * @param[in] tm Time interval value * @returns Whole number of seconds in time interval @@ -132,12 +133,31 @@ static inline int64 OS_TimeGetTotalSeconds(OS_time_t tm) return (tm.ticks / OS_TIME_TICKS_PER_SECOND); } +/*-------------------------------------------------------------------------------------*/ +/** + * @brief Get an OS_time_t interval object from an integer number of seconds + * + * This is the inverse operation of OS_TimeGetTotalSeconds(), converting the + * total number of seconds into an OS_time_t value. + * + * @sa OS_TimeGetTotalSeconds() + * + * @param[in] tm Time interval value, in seconds + * @returns OS_time_t value representing the interval + */ +static inline OS_time_t OS_TimeFromTotalSeconds(int64 tm) +{ + return (OS_time_t) {.ticks = (tm * OS_TIME_TICKS_PER_SECOND)}; +} + /*-------------------------------------------------------------------------------------*/ /** * @brief Get interval from an OS_time_t object normalized to millisecond units * * Note this refers to the complete interval, not just the fractional part. * + * @sa OS_TimeFromTotalMilliseconds() + * * @param[in] tm Time interval value * @returns Whole number of milliseconds in time interval */ @@ -146,12 +166,31 @@ static inline int64 OS_TimeGetTotalMilliseconds(OS_time_t tm) return (tm.ticks / OS_TIME_TICKS_PER_MSEC); } +/*-------------------------------------------------------------------------------------*/ +/** + * @brief Get an OS_time_t interval object from a integer number of milliseconds + * + * This is the inverse operation of OS_TimeGetTotalMilliseconds(), converting the + * total number of milliseconds into an OS_time_t value. + * + * @sa OS_TimeGetTotalMilliseconds() + * + * @param[in] tm Time interval value, in milliseconds + * @returns OS_time_t value representing the interval + */ +static inline OS_time_t OS_TimeFromTotalMilliseconds(int64 tm) +{ + return (OS_time_t) {.ticks = (tm * OS_TIME_TICKS_PER_MSEC)}; +} + /*-------------------------------------------------------------------------------------*/ /** * @brief Get interval from an OS_time_t object normalized to microsecond units * * Note this refers to the complete interval, not just the fractional part. * + * @sa OS_TimeFromTotalMicroseconds() + * * @param[in] tm Time interval value * @returns Whole number of microseconds in time interval */ @@ -160,6 +199,23 @@ static inline int64 OS_TimeGetTotalMicroseconds(OS_time_t tm) return (tm.ticks / OS_TIME_TICKS_PER_USEC); } +/*-------------------------------------------------------------------------------------*/ +/** + * @brief Get an OS_time_t interval object from a integer number of microseconds + * + * This is the inverse operation of OS_TimeGetTotalMicroseconds(), converting the + * total number of microseconds into an OS_time_t value. + * + * @sa OS_TimeGetTotalMicroseconds() + * + * @param[in] tm Time interval value, in microseconds + * @returns OS_time_t value representing the interval + */ +static inline OS_time_t OS_TimeFromTotalMicroseconds(int64 tm) +{ + return (OS_time_t) {.ticks = (tm * OS_TIME_TICKS_PER_USEC)}; +} + /*-------------------------------------------------------------------------------------*/ /** * @brief Get interval from an OS_time_t object normalized to nanosecond units @@ -170,6 +226,8 @@ static inline int64 OS_TimeGetTotalMicroseconds(OS_time_t tm) * Applications must use caution to ensure that the interval does not exceed the * representable range of a signed 64 bit integer - approximately 140 years. * + * @sa OS_TimeFromTotalNanoseconds + * * @param[in] tm Time interval value * @returns Whole number of microseconds in time interval */ @@ -178,6 +236,23 @@ static inline int64 OS_TimeGetTotalNanoseconds(OS_time_t tm) return (tm.ticks * OS_TIME_TICK_RESOLUTION_NS); } +/*-------------------------------------------------------------------------------------*/ +/** + * @brief Get an OS_time_t interval object from a integer number of nanoseconds + * + * This is the inverse operation of OS_TimeGetTotalNanoseconds(), converting the + * total number of nanoseconds into an OS_time_t value. + * + * @sa OS_TimeGetTotalNanoseconds() + * + * @param[in] tm Time interval value, in nanoseconds + * @returns OS_time_t value representing the interval + */ +static inline OS_time_t OS_TimeFromTotalNanoseconds(int64 tm) +{ + return (OS_time_t) {.ticks = (tm / OS_TIME_TICK_RESOLUTION_NS)}; +} + /*-------------------------------------------------------------------------------------*/ /** * @brief Get subseconds portion (fractional part only) from an OS_time_t object diff --git a/src/unit-test-coverage/shared/src/coveragetest-clock.c b/src/unit-test-coverage/shared/src/coveragetest-clock.c index 5493161dd..8590a0547 100644 --- a/src/unit-test-coverage/shared/src/coveragetest-clock.c +++ b/src/unit-test-coverage/shared/src/coveragetest-clock.c @@ -156,6 +156,19 @@ void Test_OS_TimeAccessConversions(void) UtAssert_UINT32_EQ(OS_TimeGetTotalMilliseconds(t3), 8666); t4 = OS_TimeSubtract(t3, t2); UtAssert_UINT32_EQ(OS_TimeGetTotalMilliseconds(t4), 3777); + + /* + * Confirm reciprocity of the Get/From unit conversions. + * Note there is no (easy) way to directly compare a OS_time_t here, + * so this uses both conversions an just confirms the result, subject + * to rounding from the conversion. In the default configuration the + * tick units are 100ns and so the numbers here are chosen such that + * the result will not lose precision, and also not overflow a uint32. + */ + UtAssert_UINT32_EQ(OS_TimeGetTotalSeconds(OS_TimeFromTotalSeconds(123)), 123); + UtAssert_UINT32_EQ(OS_TimeGetTotalMilliseconds(OS_TimeFromTotalMilliseconds(12659687)), 12659687); + UtAssert_UINT32_EQ(OS_TimeGetTotalMicroseconds(OS_TimeFromTotalMicroseconds(3329165800)), 3329165800); + UtAssert_UINT32_EQ(OS_TimeGetTotalNanoseconds(OS_TimeFromTotalNanoseconds(347230000)), 347230000); } /* Osapi_Test_Setup From 954f05369141cbede692ccefbb160d96a5133014 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 10 Oct 2022 11:29:53 -0400 Subject: [PATCH 3/6] Fix #1304, locks for condvar objects on rtems/vxworks Instantiate the condvar lock on rtems and vxworks even though the feature is not currently implemented. This is because OS_MAX_CONDVARS must still be nonzero and if the "Create" function is called, it still goes through the motions of allocating an ID. This also adds a NULL check in the lock implementation, and thus if a lock is not instantiated in the future this will not dereference a NULL pointer. --- src/os/posix/src/os-impl-idmap.c | 32 +++++++++++-------- src/os/rtems/src/os-impl-idmap.c | 20 ++++++++---- src/os/vxworks/src/os-impl-idmap.c | 19 ++++++++--- .../vxworks/src/coveragetest-idmap.c | 12 +++++-- 4 files changed, 57 insertions(+), 26 deletions(-) diff --git a/src/os/posix/src/os-impl-idmap.c b/src/os/posix/src/os-impl-idmap.c index b121b8179..27fd7c7ab 100644 --- a/src/os/posix/src/os-impl-idmap.c +++ b/src/os/posix/src/os-impl-idmap.c @@ -89,10 +89,13 @@ void OS_Lock_Global_Impl(osal_objtype_t idtype) impl = OS_impl_objtype_lock_table[idtype]; - ret = pthread_mutex_lock(&impl->mutex); - if (ret != 0) + if (impl != NULL) { - OS_DEBUG("pthread_mutex_lock(&impl->mutex): %s", strerror(ret)); + ret = pthread_mutex_lock(&impl->mutex); + if (ret != 0) + { + OS_DEBUG("pthread_mutex_lock(&impl->mutex): %s", strerror(ret)); + } } } /* end OS_Lock_Global_Impl */ @@ -112,18 +115,21 @@ void OS_Unlock_Global_Impl(osal_objtype_t idtype) impl = OS_impl_objtype_lock_table[idtype]; - /* Notify any waiting threads that the state _may_ have changed */ - ret = pthread_cond_broadcast(&impl->cond); - if (ret != 0) + if (impl != NULL) { - OS_DEBUG("pthread_cond_broadcast(&impl->cond): %s", strerror(ret)); - /* unexpected but keep going (not critical) */ - } + /* Notify any waiting threads that the state _may_ have changed */ + ret = pthread_cond_broadcast(&impl->cond); + if (ret != 0) + { + OS_DEBUG("pthread_cond_broadcast(&impl->cond): %s", strerror(ret)); + /* unexpected but keep going (not critical) */ + } - ret = pthread_mutex_unlock(&impl->mutex); - if (ret != 0) - { - OS_DEBUG("pthread_mutex_unlock(&impl->mutex): %s", strerror(ret)); + ret = pthread_mutex_unlock(&impl->mutex); + if (ret != 0) + { + OS_DEBUG("pthread_mutex_unlock(&impl->mutex): %s", strerror(ret)); + } } } /* end OS_Unlock_Global_Impl */ diff --git a/src/os/rtems/src/os-impl-idmap.c b/src/os/rtems/src/os-impl-idmap.c index 74c7e9b75..283d4eaae 100644 --- a/src/os/rtems/src/os-impl-idmap.c +++ b/src/os/rtems/src/os-impl-idmap.c @@ -55,6 +55,7 @@ static OS_impl_objtype_lock_t OS_timecb_table_lock; static OS_impl_objtype_lock_t OS_module_table_lock; static OS_impl_objtype_lock_t OS_filesys_table_lock; static OS_impl_objtype_lock_t OS_console_lock; +static OS_impl_objtype_lock_t OS_condvar_lock; OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER] = { [OS_OBJECT_TYPE_UNDEFINED] = NULL, @@ -70,6 +71,7 @@ OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER] = [OS_OBJECT_TYPE_OS_MODULE] = &OS_module_table_lock, [OS_OBJECT_TYPE_OS_FILESYS] = &OS_filesys_table_lock, [OS_OBJECT_TYPE_OS_CONSOLE] = &OS_console_lock, + [OS_OBJECT_TYPE_OS_CONDVAR] = &OS_condvar_lock, }; /*---------------------------------------------------------------- @@ -87,10 +89,13 @@ void OS_Lock_Global_Impl(osal_objtype_t idtype) impl = OS_impl_objtype_lock_table[idtype]; - rtems_sc = rtems_semaphore_obtain(impl->id, RTEMS_WAIT, RTEMS_NO_TIMEOUT); - if (rtems_sc != RTEMS_SUCCESSFUL) + if (impl != NULL) { - OS_DEBUG("OS_Lock_Global_Impl: rtems_semaphore_obtain failed: %s\n", rtems_status_text(rtems_sc)); + rtems_sc = rtems_semaphore_obtain(impl->id, RTEMS_WAIT, RTEMS_NO_TIMEOUT); + if (rtems_sc != RTEMS_SUCCESSFUL) + { + OS_DEBUG("OS_Lock_Global_Impl: rtems_semaphore_obtain failed: %s\n", rtems_status_text(rtems_sc)); + } } } /* end OS_Lock_Global_Impl */ @@ -110,10 +115,13 @@ void OS_Unlock_Global_Impl(osal_objtype_t idtype) impl = OS_impl_objtype_lock_table[idtype]; - rtems_sc = rtems_semaphore_release(impl->id); - if (rtems_sc != RTEMS_SUCCESSFUL) + if (impl != NULL) { - OS_DEBUG("OS_Unlock_Global_Impl: rtems_semaphore_release failed: %s\n", rtems_status_text(rtems_sc)); + rtems_sc = rtems_semaphore_release(impl->id); + if (rtems_sc != RTEMS_SUCCESSFUL) + { + OS_DEBUG("OS_Unlock_Global_Impl: rtems_semaphore_release failed: %s\n", rtems_status_text(rtems_sc)); + } } } /* end OS_Unlock_Global_Impl */ diff --git a/src/os/vxworks/src/os-impl-idmap.c b/src/os/vxworks/src/os-impl-idmap.c index 532406dc8..45aa7e80a 100644 --- a/src/os/vxworks/src/os-impl-idmap.c +++ b/src/os/vxworks/src/os-impl-idmap.c @@ -57,6 +57,7 @@ VX_MUTEX_SEMAPHORE(OS_timecb_table_mut_mem); VX_MUTEX_SEMAPHORE(OS_module_table_mut_mem); VX_MUTEX_SEMAPHORE(OS_filesys_table_mut_mem); VX_MUTEX_SEMAPHORE(OS_console_table_mut_mem); +VX_MUTEX_SEMAPHORE(OS_condvar_table_mut_mem); static OS_impl_objtype_lock_t OS_task_table_lock = {.mem = OS_task_table_mut_mem}; static OS_impl_objtype_lock_t OS_queue_table_lock = {.mem = OS_queue_table_mut_mem}; @@ -70,6 +71,7 @@ static OS_impl_objtype_lock_t OS_timecb_table_lock = {.mem = OS_timecb_table_ static OS_impl_objtype_lock_t OS_module_table_lock = {.mem = OS_module_table_mut_mem}; static OS_impl_objtype_lock_t OS_filesys_table_lock = {.mem = OS_filesys_table_mut_mem}; static OS_impl_objtype_lock_t OS_console_table_lock = {.mem = OS_console_table_mut_mem}; +static OS_impl_objtype_lock_t OS_condvar_table_lock = {.mem = OS_condvar_table_mut_mem}; OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER] = { [OS_OBJECT_TYPE_UNDEFINED] = NULL, @@ -84,7 +86,8 @@ OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER] = [OS_OBJECT_TYPE_OS_TIMECB] = &OS_timecb_table_lock, [OS_OBJECT_TYPE_OS_MODULE] = &OS_module_table_lock, [OS_OBJECT_TYPE_OS_FILESYS] = &OS_filesys_table_lock, - [OS_OBJECT_TYPE_OS_CONSOLE] = &OS_console_table_lock}; + [OS_OBJECT_TYPE_OS_CONSOLE] = &OS_console_table_lock, + [OS_OBJECT_TYPE_OS_CONDVAR] = &OS_condvar_table_lock}; /*---------------------------------------------------------------- * @@ -100,9 +103,12 @@ void OS_Lock_Global_Impl(osal_objtype_t idtype) impl = OS_impl_objtype_lock_table[idtype]; - if (semTake(impl->vxid, WAIT_FOREVER) != OK) + if (impl != NULL) { - OS_DEBUG("semTake() - vxWorks errno %d\n", errno); + if (semTake(impl->vxid, WAIT_FOREVER) != OK) + { + OS_DEBUG("semTake() - vxWorks errno %d\n", errno); + } } } /* end OS_Lock_Global_Impl */ @@ -121,9 +127,12 @@ void OS_Unlock_Global_Impl(osal_objtype_t idtype) impl = OS_impl_objtype_lock_table[idtype]; - if (semGive(impl->vxid) != OK) + if (impl != NULL) { - OS_DEBUG("semGive() - vxWorks errno %d\n", errno); + if (semGive(impl->vxid) != OK) + { + OS_DEBUG("semGive() - vxWorks errno %d\n", errno); + } } } /* end OS_Unlock_Global_Impl */ diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c b/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c index 881c31120..31edfd31f 100644 --- a/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c +++ b/src/unit-test-coverage/vxworks/src/coveragetest-idmap.c @@ -42,7 +42,11 @@ void Test_OS_Lock_Global_Impl(void) UT_IdMapTest_SetImplTableMutex(OS_OBJECT_TYPE_OS_TASK, &TestGlobalSem); OS_Lock_Global_Impl(OS_OBJECT_TYPE_OS_TASK); - UtAssert_True(UT_GetStubCount(UT_KEY(OCS_semTake)) == 1, "semTake() called"); + UtAssert_STUB_COUNT(OCS_semTake, 1); + + /* The "undefined" type should not have a lock instantiated */ + OS_Lock_Global_Impl(OS_OBJECT_TYPE_UNDEFINED); + UtAssert_STUB_COUNT(OCS_semTake, 1); UT_SetDefaultReturnValue(UT_KEY(OCS_semTake), -1); OS_Lock_Global_Impl(OS_OBJECT_TYPE_OS_TASK); /* for coverage of error path */ @@ -57,7 +61,11 @@ void Test_OS_Unlock_Global_Impl(void) UT_IdMapTest_SetImplTableMutex(OS_OBJECT_TYPE_OS_TASK, &TestGlobalSem); OS_Unlock_Global_Impl(OS_OBJECT_TYPE_OS_TASK); - UtAssert_True(UT_GetStubCount(UT_KEY(OCS_semGive)) == 1, "semTake() called"); + UtAssert_STUB_COUNT(OCS_semGive, 1); + + /* The "undefined" type should not have a lock instantiated */ + OS_Unlock_Global_Impl(OS_OBJECT_TYPE_UNDEFINED); + UtAssert_STUB_COUNT(OCS_semGive, 1); UT_SetDefaultReturnValue(UT_KEY(OCS_semGive), -1); OS_Unlock_Global_Impl(OS_OBJECT_TYPE_OS_TASK); /* for coverage of error path */ From 58a24bd6ead166681e6000187334d9238fc86fa1 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Fri, 23 Sep 2022 11:05:07 -0400 Subject: [PATCH 4/6] Fix #1284, add export targets and package script Adds optional "install" commands to CMake script, which is useful when building OSAL as a standalone software package. The public API and static libraries will be installed to the specified system location, and can then be used to compile and link external OSAL applications without the need for the original OSAL source or build trees. Note this also installs the "osconfig.h" file as this does affect the binary formats of some items (i.e. size of items using OS_MAX_API_NAME and other similar structure members). The external application must be compiled using the same osconfig.h after installation. --- CMakeLists.txt | 58 ++++++++++++++++++++++++++++++++++++- NasaOsalConfig.cmake.in | 6 ++++ src/ut-stubs/CMakeLists.txt | 8 +++++ ut_assert/CMakeLists.txt | 21 ++++++++++++++ 4 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 NasaOsalConfig.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index a3d6b5d40..4bf4d875e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,15 @@ # Normally this setting is not needed to be configured as it is # inferred from the BSP type. # +# OSAL_INSTALL_LIBRARIES : Boolean, enables "install" of targets listed above such +# that libraries and public API header files are copied into the system +# location specified by CMAKE_INSTALL_PREFIX. This set of headers +# and link libraries can then be used to compile other applications +# separately from OSAL. Default is "ON" when OSAL is being compiled +# standalone (i.e. cmake called directly on the OSAL source dir). +# Default is "OFF" when OSAL is included via 'add_subdirectory' in +# a parent application project such as CFE/CFS. +# # ENABLE_UNIT_TESTS : Boolean, enables build of the unit tests (coverage and functional) # # OSAL_OMIT_DEPRECATED : Boolean, Compile without deprecated or obsolete features for @@ -99,8 +108,24 @@ define_property(TARGET PROPERTY OSAL_EXPECTED_OSTYPE "This property is used to indicate the OS implementation layer that is intended to be paired with the BSP implementation" ) +# If this build is being performed as a subdirectory within a larger project, +# then the static libraries and header files will _not_ be installed by default, +# as in those cases one would typically just use the "osal" target directly. +# This behavior can be explicitly controlled via the OSAL_INSTALL_LIBRARIES option. +get_directory_property(HAS_PARENT PARENT_DIRECTORY) +if (HAS_PARENT) + set(OSAL_DEFAULT_INSTALL_LIBRARIES OFF) +else() + set(OSAL_DEFAULT_INSTALL_LIBRARIES ON) +endif() + +option(OSAL_INSTALL_LIBRARIES "Whether or not to install static libraries and headers" ${OSAL_DEFAULT_INSTALL_LIBRARIES}) option(OSAL_OMIT_DEPRECATED "Compile without deprecated or obsolete features for backward compatibility testing" OFF) +if (OSAL_INSTALL_LIBRARIES) + include(CMakePackageConfigHelpers) +endif() + # The "OSAL_EXT_SOURCE_DIR" cache variable may be set to a path # on the host containing extra OS/BSP implementations which are not # part of the open source release. @@ -406,7 +431,6 @@ endif (ENABLE_UNIT_TESTS) # If this build is being performed as a subdirectory within a larger project, # then export the important data regarding compile flags/dirs to that parent # This is conditional to avoid warnings in a standalone build. -get_directory_property(HAS_PARENT PARENT_DIRECTORY) if (HAS_PARENT) # Export the UT coverage compiler/linker flags to the parent build. # These flags are based on the target system type and should be used @@ -420,3 +444,35 @@ else(HAS_PARENT) # Note that in a CFE/integrated build, it is expected this will be built separately. add_subdirectory(docs/src docs) endif(HAS_PARENT) + +if (OSAL_INSTALL_LIBRARIES) + + # Install and also export this library, so it can be found via + # "find_package()" from some other CMake build + install( + TARGETS osal_public_api osal_bsp osal + EXPORT nasa-osal-export + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/osal + INCLUDES DESTINATION include/osal + ) + install(DIRECTORY + ${OSAL_SOURCE_DIR}/src/os/inc/ + ${CMAKE_CURRENT_BINARY_DIR}/inc/ + DESTINATION include/osal + ) + install(EXPORT nasa-osal-export + FILE NasaOsalTargets.cmake + DESTINATION lib/cmake + ) + configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/NasaOsalConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/NasaOsalConfig.cmake" + INSTALL_DESTINATION lib/cmake + ) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/NasaOsalConfig.cmake" + DESTINATION lib/cmake + ) + +endif() diff --git a/NasaOsalConfig.cmake.in b/NasaOsalConfig.cmake.in new file mode 100644 index 000000000..945114467 --- /dev/null +++ b/NasaOsalConfig.cmake.in @@ -0,0 +1,6 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/NasaOsalTargets.cmake") + +check_required_components(NasaOsal) + diff --git a/src/ut-stubs/CMakeLists.txt b/src/ut-stubs/CMakeLists.txt index fdd8ab61d..0e08cff30 100644 --- a/src/ut-stubs/CMakeLists.txt +++ b/src/ut-stubs/CMakeLists.txt @@ -106,3 +106,11 @@ target_link_libraries(ut_osapi_stubs PUBLIC ut_assert ) +if (OSAL_INSTALL_LIBRARIES) + install( + TARGETS ut_osapi_stubs + EXPORT nasa-osal-export + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) +endif() diff --git a/ut_assert/CMakeLists.txt b/ut_assert/CMakeLists.txt index e834aa0e7..0278fe2e5 100644 --- a/ut_assert/CMakeLists.txt +++ b/ut_assert/CMakeLists.txt @@ -82,4 +82,25 @@ target_link_libraries(ut_coverage_compile INTERFACE ut_assert) add_library(ut_coverage_link INTERFACE) target_link_libraries(ut_coverage_link INTERFACE ut_assert) +if (OSAL_INSTALL_LIBRARIES) + install( + TARGETS ut_assert ut_coverage_compile ut_coverage_link + EXPORT nasa-osal-export + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/ut_assert + INCLUDES DESTINATION include/ut_assert + ) + install(DIRECTORY + ${UT_ASSERT_SOURCE_DIR}/inc/ + DESTINATION include/ut_assert + ) + install( + PROGRAMS scripts/generate_stubs.pl + DESTINATION bin + RENAME utassert_generate_stubs.pl + ) + +endif() From 662fda0789e0c0d51d78d4d3910f552a4a2232ec Mon Sep 17 00:00:00 2001 From: Avi Date: Mon, 10 Oct 2022 13:07:15 +1000 Subject: [PATCH 5/6] Fix #1308, Comments and empty lines cleanup --- src/bsp/generic-linux/src/bsp_start.c | 1 - src/bsp/generic-vxworks/src/bsp_start.c | 1 - .../src/generic_vxworks_bsp_internal.h | 1 - src/bsp/shared/inc/bsp-impl.h | 6 - .../tasking-example/tasking-example.c | 1 - src/os/inc/osapi-bsp.h | 5 - src/os/inc/osapi-timer.h | 1 - src/os/portable/os-impl-bsd-select.c | 16 +-- src/os/portable/os-impl-bsd-sockets.c | 51 ++------ src/os/portable/os-impl-console-bsp.c | 4 +- src/os/portable/os-impl-no-loader.c | 15 +-- src/os/portable/os-impl-no-network.c | 8 +- src/os/portable/os-impl-no-select.c | 8 +- src/os/portable/os-impl-no-shell.c | 2 - src/os/portable/os-impl-posix-dirs.c | 24 +--- src/os/portable/os-impl-posix-dl-loader.c | 15 +-- src/os/portable/os-impl-posix-dl-symtab.c | 17 +-- src/os/portable/os-impl-posix-files.c | 21 +--- src/os/portable/os-impl-posix-gettime.c | 9 +- src/os/portable/os-impl-posix-io.c | 16 +-- src/os/portable/os-impl-posix-network.c | 8 +- src/os/posix/inc/os-impl-timebase.h | 1 - src/os/posix/src/os-impl-binsem.c | 33 ++---- src/os/posix/src/os-impl-common.c | 14 +-- src/os/posix/src/os-impl-condvar.c | 20 ---- src/os/posix/src/os-impl-console.c | 13 +- src/os/posix/src/os-impl-countsem.c | 29 ++--- src/os/posix/src/os-impl-dirs.c | 2 +- src/os/posix/src/os-impl-files.c | 2 +- src/os/posix/src/os-impl-filesys.c | 35 ++---- src/os/posix/src/os-impl-heap.c | 4 +- src/os/posix/src/os-impl-idmap.c | 14 +-- src/os/posix/src/os-impl-loader.c | 4 +- src/os/posix/src/os-impl-mutex.c | 26 +--- src/os/posix/src/os-impl-no-module.c | 4 +- src/os/posix/src/os-impl-queues.c | 19 +-- src/os/posix/src/os-impl-shell.c | 4 +- src/os/posix/src/os-impl-tasks.c | 56 ++------- src/os/posix/src/os-impl-timebase.c | 37 ++---- src/os/rtems/inc/os-impl-timebase.h | 1 - src/os/rtems/src/os-impl-binsem.c | 37 ++---- src/os/rtems/src/os-impl-common.c | 10 +- src/os/rtems/src/os-impl-console.c | 13 +- src/os/rtems/src/os-impl-countsem.c | 34 ++---- src/os/rtems/src/os-impl-dirs.c | 2 +- src/os/rtems/src/os-impl-files.c | 2 +- src/os/rtems/src/os-impl-filesys.c | 36 ++---- src/os/rtems/src/os-impl-heap.c | 4 +- src/os/rtems/src/os-impl-idmap.c | 14 +-- src/os/rtems/src/os-impl-loader.c | 23 +--- src/os/rtems/src/os-impl-mutex.c | 29 +---- src/os/rtems/src/os-impl-network.c | 8 +- src/os/rtems/src/os-impl-no-module.c | 4 +- src/os/rtems/src/os-impl-queues.c | 28 +---- src/os/rtems/src/os-impl-tasks.c | 55 ++------- src/os/rtems/src/os-impl-timebase.c | 44 ++----- src/os/shared/inc/os-shared-binsem.h | 7 -- src/os/shared/inc/os-shared-clock.h | 2 - src/os/shared/inc/os-shared-common.h | 6 - src/os/shared/inc/os-shared-condvar.h | 9 -- src/os/shared/inc/os-shared-console.h | 3 - src/os/shared/inc/os-shared-countsem.h | 6 - src/os/shared/inc/os-shared-dir.h | 6 - src/os/shared/inc/os-shared-file.h | 11 -- src/os/shared/inc/os-shared-filesys.h | 7 -- src/os/shared/inc/os-shared-heap.h | 1 - src/os/shared/inc/os-shared-idmap.h | 36 ------ src/os/shared/inc/os-shared-module.h | 7 -- src/os/shared/inc/os-shared-mutex.h | 5 - src/os/shared/inc/os-shared-network.h | 3 - src/os/shared/inc/os-shared-printf.h | 1 - src/os/shared/inc/os-shared-queue.h | 5 - src/os/shared/inc/os-shared-select.h | 3 - src/os/shared/inc/os-shared-shell.h | 1 - src/os/shared/inc/os-shared-sockets.h | 15 --- src/os/shared/inc/os-shared-task.h | 17 --- src/os/shared/inc/os-shared-timebase.h | 8 -- src/os/shared/src/osapi-binsem.c | 39 ++---- src/os/shared/src/osapi-clock.c | 10 +- src/os/shared/src/osapi-common.c | 30 +---- src/os/shared/src/osapi-condvar.c | 22 ---- src/os/shared/src/osapi-countsem.c | 35 ++---- src/os/shared/src/osapi-debug.c | 5 +- src/os/shared/src/osapi-dir.c | 31 ++--- src/os/shared/src/osapi-errors.c | 6 +- src/os/shared/src/osapi-file.c | 81 +++---------- src/os/shared/src/osapi-filesys.c | 65 +++------- src/os/shared/src/osapi-heap.c | 4 +- src/os/shared/src/osapi-idmap.c | 111 ++++-------------- src/os/shared/src/osapi-module.c | 41 ++----- src/os/shared/src/osapi-mutex.c | 34 ++---- src/os/shared/src/osapi-network.c | 13 +- src/os/shared/src/osapi-printf.c | 25 +--- src/os/shared/src/osapi-queue.c | 32 ++--- src/os/shared/src/osapi-select.c | 24 +--- src/os/shared/src/osapi-shell.c | 4 +- src/os/shared/src/osapi-sockets.c | 65 +++------- src/os/shared/src/osapi-task.c | 54 ++------- src/os/shared/src/osapi-time.c | 36 ++---- src/os/shared/src/osapi-timebase.c | 36 ++---- src/os/shared/src/osapi-version.c | 8 -- src/os/vxworks/src/os-impl-binsem.c | 35 ++---- src/os/vxworks/src/os-impl-common.c | 20 +--- src/os/vxworks/src/os-impl-console.c | 13 +- src/os/vxworks/src/os-impl-countsem.c | 31 ++--- src/os/vxworks/src/os-impl-dirs-globals.c | 4 +- src/os/vxworks/src/os-impl-files.c | 4 +- src/os/vxworks/src/os-impl-filesys.c | 35 ++---- src/os/vxworks/src/os-impl-heap.c | 4 +- src/os/vxworks/src/os-impl-idmap.c | 17 +-- src/os/vxworks/src/os-impl-loader.c | 19 +-- src/os/vxworks/src/os-impl-mutex.c | 26 +--- src/os/vxworks/src/os-impl-network.c | 9 +- src/os/vxworks/src/os-impl-no-module.c | 4 +- src/os/vxworks/src/os-impl-queues.c | 28 +---- src/os/vxworks/src/os-impl-shell.c | 5 +- src/os/vxworks/src/os-impl-sockets.c | 2 - src/os/vxworks/src/os-impl-symtab.c | 22 +--- src/os/vxworks/src/os-impl-tasks.c | 54 ++------- src/os/vxworks/src/os-impl-timebase.c | 45 ++----- src/tests/bin-sem-test/bin-sem-test.c | 1 - .../file-sys-add-fixed-map-api-test.c | 3 +- src/tests/idmap-api-test/idmap-api-test.c | 3 +- src/tests/mutex-test/mutex-test.c | 1 - src/tests/network-api-test/network-api-test.c | 18 +-- src/tests/osal-core-test/osal-core-test.c | 29 ++--- src/tests/queue-test/queue-test.c | 1 - src/tests/select-test/select-test.c | 6 +- src/tests/shell-test/shell-test.c | 3 +- src/tests/symbol-api-test/symbol-api-test.c | 2 +- .../time-base-api-test/time-base-api-test.c | 3 +- .../timer-add-api-test/timer-add-api-test.c | 3 +- src/tests/timer-test/timer-test.c | 2 - .../portable/src/coveragetest-bsd-select.c | 5 +- .../shared/src/coveragetest-common.c | 1 - .../shared/src/coveragetest-heap.c | 1 + .../shared/src/coveragetest-task.c | 3 + .../shared/src/coveragetest-time.c | 1 + .../ut-stubs/inc/OCS_bsp-impl.h | 2 - .../ut-stubs/inc/OCS_moduleLib.h | 1 - .../ut-stubs/src/bsp-console-impl-stubs.c | 2 - .../src/os-shared-common-impl-stubs.c | 2 - .../ut-stubs/src/os-shared-task-impl-stubs.c | 1 - .../ut-stubs/src/posix-pthread-stubs.c | 1 + .../ut-stubs/src/vxworks-intLib-stubs.c | 4 + .../ut-stubs/src/vxworks-msgQLib-stubs.c | 3 + .../ut-stubs/src/vxworks-semLib-stubs.c | 8 ++ .../ut-stubs/src/vxworks-taskLib-stubs.c | 8 ++ .../vxworks/src/coveragetest-common.c | 5 +- .../vxworks/src/coveragetest-network.c | 8 +- .../ostimer-test/ut_ostimer_timerio_test.c | 1 - src/ut-stubs/osapi-clock-handlers.c | 4 +- src/ut-stubs/osapi-common-stubs.c | 3 - src/ut-stubs/osapi-idmap-handlers.c | 3 +- src/ut-stubs/osapi-printf-stubs.c | 2 - src/ut-stubs/osapi-task-stubs.c | 1 - src/ut-stubs/osapi-version-stubs.c | 1 - ut_assert/scripts/generate_stubs.pl | 1 - ut_assert/src/uttools.c | 1 - 159 files changed, 519 insertions(+), 1867 deletions(-) diff --git a/src/bsp/generic-linux/src/bsp_start.c b/src/bsp/generic-linux/src/bsp_start.c index 707a0420c..a2893de63 100644 --- a/src/bsp/generic-linux/src/bsp_start.c +++ b/src/bsp/generic-linux/src/bsp_start.c @@ -182,7 +182,6 @@ void OS_BSP_Shutdown_Impl(void) } /****************************************************************************** -** Function: main() ** ** Purpose: ** BSP Application entry point. diff --git a/src/bsp/generic-vxworks/src/bsp_start.c b/src/bsp/generic-vxworks/src/bsp_start.c index 87d72a5b2..c74fc9b97 100644 --- a/src/bsp/generic-vxworks/src/bsp_start.c +++ b/src/bsp/generic-vxworks/src/bsp_start.c @@ -77,7 +77,6 @@ void OS_BSP_Shutdown_Impl(void) } /****************************************************************************** -** Function: OS_BSPMain() ** ** Purpose: ** vxWorks/BSP Application entry point. diff --git a/src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h b/src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h index 87dc7116c..d0f336571 100644 --- a/src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h +++ b/src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h @@ -40,7 +40,6 @@ typedef struct { SEM_ID AccessMutex; VX_MUTEX_SEMAPHORE(AccessMutexMem); - } OS_BSP_GenericVxWorksGlobalData_t; /* diff --git a/src/bsp/shared/inc/bsp-impl.h b/src/bsp/shared/inc/bsp-impl.h index ba6c8daa8..df249316b 100644 --- a/src/bsp/shared/inc/bsp-impl.h +++ b/src/bsp/shared/inc/bsp-impl.h @@ -103,7 +103,6 @@ typedef struct * feature. */ uint32 ResoureConfig[OS_OBJECT_TYPE_USER]; - } OS_BSP_GlobalData_t; /* @@ -116,7 +115,6 @@ extern OS_BSP_GlobalData_t OS_BSP_Global; /********************************************************************/ /*---------------------------------------------------------------- - Function: OS_BSP_Lock_Impl Purpose: Get exclusive access to a BSP-provided service or object @@ -127,7 +125,6 @@ extern OS_BSP_GlobalData_t OS_BSP_Global; void OS_BSP_Lock_Impl(void); /*---------------------------------------------------------------- - Function: OS_BSP_Unlock_Impl Purpose: Release exclusive access to a BSP-provided service or object @@ -138,7 +135,6 @@ void OS_BSP_Lock_Impl(void); void OS_BSP_Unlock_Impl(void); /*---------------------------------------------------------------- - Function: OS_BSP_ConsoleOutput_Impl Purpose: Low level raw console data output. Writes a sequence of characters directly to the BSP debug terminal or console device. @@ -153,7 +149,6 @@ void OS_BSP_Unlock_Impl(void); void OS_BSP_ConsoleOutput_Impl(const char *Str, size_t DataLen); /*---------------------------------------------------------------- - Function: OS_BSP_ConsoleSetMode_Impl Purpose: Set the console output mode, if supported by the BSP. @@ -171,7 +166,6 @@ void OS_BSP_ConsoleOutput_Impl(const char *Str, size_t DataLen); void OS_BSP_ConsoleSetMode_Impl(uint32 ModeBits); /*---------------------------------------------------------------- - Function: OS_BSP_Shutdown_Impl Purpose: Causes the calling task to abort in a BSP-safe way. This may map to the abort() system call, but on some systems diff --git a/src/examples/tasking-example/tasking-example.c b/src/examples/tasking-example/tasking-example.c index bbcba4f63..2316e767e 100644 --- a/src/examples/tasking-example/tasking-example.c +++ b/src/examples/tasking-example/tasking-example.c @@ -207,7 +207,6 @@ void task_2(void) void task_3(void) { - uint32 data_received; uint32 data_size; uint32 status; diff --git a/src/os/inc/osapi-bsp.h b/src/os/inc/osapi-bsp.h index 6902df3da..e292e675b 100644 --- a/src/os/inc/osapi-bsp.h +++ b/src/os/inc/osapi-bsp.h @@ -43,7 +43,6 @@ */ /*---------------------------------------------------------------- - Function: OS_BSP_SetResourceTypeConfig Purpose: Sets BSP/platform-specific flags for the given resource type Flags and bit meanings are all platform defined. @@ -51,7 +50,6 @@ void OS_BSP_SetResourceTypeConfig(uint32 ResourceType, uint32 ConfigOptionValue); /*---------------------------------------------------------------- - Function: OS_BSP_SetResourceTypeConfig Purpose: Gets BSP/platform-specific flags for the given resource type Flags and bit meanings are all platform defined. @@ -59,7 +57,6 @@ void OS_BSP_SetResourceTypeConfig(uint32 ResourceType, uint32 ConfigOptionValue) uint32 OS_BSP_GetResourceTypeConfig(uint32 ResourceType); /*---------------------------------------------------------------- - Function: OS_BSP_GetArgC Purpose: Obtain the number of boot arguments passed from the bootloader or shell if supported by the platform @@ -70,7 +67,6 @@ uint32 OS_BSP_GetResourceTypeConfig(uint32 ResourceType); uint32 OS_BSP_GetArgC(void); /*---------------------------------------------------------------- - Function: OS_BSP_GetArgV Purpose: Obtain an array of boot argument strings passed from the bootloader or shell if supported by the platform @@ -83,7 +79,6 @@ uint32 OS_BSP_GetArgC(void); char *const *OS_BSP_GetArgV(void); /*---------------------------------------------------------------- - Function: OS_BSP_SetExitCode Purpose: Sets the status to be returned to the shell or bootloader if supported by the platform. The value is an integer with diff --git a/src/os/inc/osapi-timer.h b/src/os/inc/osapi-timer.h index 7c44523a0..6c30c5a65 100644 --- a/src/os/inc/osapi-timer.h +++ b/src/os/inc/osapi-timer.h @@ -41,7 +41,6 @@ typedef struct uint32 start_time; uint32 interval_time; uint32 accuracy; - } OS_timer_prop_t; /** @defgroup OSAPITimer OSAL Timer APIs diff --git a/src/os/portable/os-impl-bsd-select.c b/src/os/portable/os-impl-bsd-select.c index f3ce85066..baa516797 100644 --- a/src/os/portable/os-impl-bsd-select.c +++ b/src/os/portable/os-impl-bsd-select.c @@ -61,7 +61,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * Function: OS_FdSet_ConvertIn_Impl * * Purpose: Local helper routine, not part of OSAL API. * @@ -113,7 +112,7 @@ static int32 OS_FdSet_ConvertIn_Impl(int *os_maxfd, fd_set *os_set, const OS_FdS } return status; -} /* end OS_FdSet_ConvertIn_Impl */ +} /*----------------------------------------------------------------*/ /** @@ -155,10 +154,9 @@ static void OS_FdSet_ConvertOut_Impl(fd_set *OS_set, OS_FdSet *OSAL_set) objids >>= 1; } } -} /* end OS_FdSet_ConvertOut_Impl */ +} /*---------------------------------------------------------------- - * Function: OS_DoSelect * * Purpose: Local helper routine, not part of OSAL API. * @@ -243,15 +241,13 @@ static int32 OS_DoSelect(int maxfd, fd_set *rd_set, fd_set *wr_set, int32 msecs) } return return_code; -} /* end OS_DoSelect */ +} /**************************************************************************************** SELECT API ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_SelectSingle_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -319,11 +315,9 @@ int32 OS_SelectSingle_Impl(const OS_object_token_t *token, uint32 *SelectFlags, } return return_code; -} /* end OS_SelectSingle_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SelectMultiple_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -382,4 +376,4 @@ int32 OS_SelectMultiple_Impl(OS_FdSet *ReadSet, OS_FdSet *WriteSet, int32 msecs) } return return_code; -} /* end OS_SelectMultiple_Impl */ +} diff --git a/src/os/portable/os-impl-bsd-sockets.c b/src/os/portable/os-impl-bsd-sockets.c index 6edeaeb9a..72a0febb1 100644 --- a/src/os/portable/os-impl-bsd-sockets.c +++ b/src/os/portable/os-impl-bsd-sockets.c @@ -132,8 +132,6 @@ void OS_SetSocketDefaultFlags_Impl(const OS_object_token_t *token) ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_SocketOpen_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -208,11 +206,9 @@ int32 OS_SocketOpen_Impl(const OS_object_token_t *token) OS_IMPL_SET_SOCKET_FLAGS(token); return OS_SUCCESS; -} /* end OS_SocketOpen_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketBind_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -269,11 +265,9 @@ int32 OS_SocketBind_Impl(const OS_object_token_t *token, const OS_SockAddr_t *Ad } } return OS_SUCCESS; -} /* end OS_SocketBind_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketConnect_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -367,10 +361,9 @@ int32 OS_SocketConnect_Impl(const OS_object_token_t *token, const OS_SockAddr_t } } return return_code; -} /* end OS_SocketConnect_Impl */ +} /*---------------------------------------------------------------- - Function: OS_SocketShutdown_Impl Purpose: Connects the socket to a remote address. Socket must be of the STREAM variety. @@ -410,11 +403,9 @@ int32 OS_SocketShutdown_Impl(const OS_object_token_t *token, OS_SocketShutdownMo } return return_code; -} /* end OS_SocketShutdown_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAccept_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -466,11 +457,9 @@ int32 OS_SocketAccept_Impl(const OS_object_token_t *sock_token, const OS_object_ } return return_code; -} /* end OS_SocketAccept_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketRecvFrom_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -558,11 +547,9 @@ int32 OS_SocketRecvFrom_Impl(const OS_object_token_t *token, void *buffer, size_ } return return_code; -} /* end OS_SocketRecvFrom_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketSendTo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -607,11 +594,9 @@ int32 OS_SocketSendTo_Impl(const OS_object_token_t *token, const void *buffer, s } return os_result; -} /* end OS_SocketSendTo_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -620,11 +605,9 @@ int32 OS_SocketSendTo_Impl(const OS_object_token_t *token, const void *buffer, s int32 OS_SocketGetInfo_Impl(const OS_object_token_t *token, OS_socket_prop_t *sock_prop) { return OS_SUCCESS; -} /* end OS_SocketGetInfo_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrInit_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -666,11 +649,9 @@ int32 OS_SocketAddrInit_Impl(OS_SockAddr_t *Addr, OS_SocketDomain_t Domain) Accessor->sa.sa_family = sa_family; return OS_SUCCESS; -} /* end OS_SocketAddrInit_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrToString_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -704,11 +685,9 @@ int32 OS_SocketAddrToString_Impl(char *buffer, size_t buflen, const OS_SockAddr_ } return OS_SUCCESS; -} /* end OS_SocketAddrToString_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrFromString_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -743,11 +722,9 @@ int32 OS_SocketAddrFromString_Impl(OS_SockAddr_t *Addr, const char *string) } return OS_SUCCESS; -} /* end OS_SocketAddrFromString_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrGetPort_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -778,11 +755,9 @@ int32 OS_SocketAddrGetPort_Impl(uint16 *PortNum, const OS_SockAddr_t *Addr) *PortNum = ntohs(sa_port); return OS_SUCCESS; -} /* end OS_SocketAddrGetPort_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrSetPort_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -811,4 +786,4 @@ int32 OS_SocketAddrSetPort_Impl(OS_SockAddr_t *Addr, uint16 PortNum) } return OS_SUCCESS; -} /* end OS_SocketAddrSetPort_Impl */ +} diff --git a/src/os/portable/os-impl-console-bsp.c b/src/os/portable/os-impl-console-bsp.c index 8f9aba26e..c3889eddf 100644 --- a/src/os/portable/os-impl-console-bsp.c +++ b/src/os/portable/os-impl-console-bsp.c @@ -46,8 +46,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ConsoleOutput_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -92,4 +90,4 @@ void OS_ConsoleOutput_Impl(const OS_object_token_t *token) /* Update the global with the new read location */ console->ReadPos = StartPos; -} /* end OS_ConsoleOutput_Impl */ +} diff --git a/src/os/portable/os-impl-no-loader.c b/src/os/portable/os-impl-no-loader.c index 249a73567..318d052dd 100644 --- a/src/os/portable/os-impl-no-loader.c +++ b/src/os/portable/os-impl-no-loader.c @@ -28,8 +28,6 @@ #include "os-shared-module.h" /*---------------------------------------------------------------- - * - * Function: OS_ModuleLoad_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -38,12 +36,9 @@ int32 OS_ModuleLoad_Impl(const OS_object_token_t *token, const char *translated_path) { return OS_ERR_NOT_IMPLEMENTED; - -} /* end OS_ModuleLoad_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleUnload_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -52,12 +47,9 @@ int32 OS_ModuleLoad_Impl(const OS_object_token_t *token, const char *translated_ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token) { return OS_ERR_NOT_IMPLEMENTED; - -} /* end OS_ModuleUnload_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -66,5 +58,4 @@ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token) int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *module_prop) { return OS_ERR_NOT_IMPLEMENTED; - -} /* end OS_ModuleGetInfo_Impl */ +} diff --git a/src/os/portable/os-impl-no-network.c b/src/os/portable/os-impl-no-network.c index d7c52860d..ba871eb3d 100644 --- a/src/os/portable/os-impl-no-network.c +++ b/src/os/portable/os-impl-no-network.c @@ -33,8 +33,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetID_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -43,11 +41,9 @@ int32 OS_NetworkGetID_Impl(int32 *IdBuf) { return OS_ERR_NOT_IMPLEMENTED; -} /* end OS_NetworkGetID_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetHostName_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -56,4 +52,4 @@ int32 OS_NetworkGetID_Impl(int32 *IdBuf) int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len) { return OS_ERR_NOT_IMPLEMENTED; -} /* end OS_NetworkGetHostName_Impl */ +} diff --git a/src/os/portable/os-impl-no-select.c b/src/os/portable/os-impl-no-select.c index 37b95a356..9cd416bef 100644 --- a/src/os/portable/os-impl-no-select.c +++ b/src/os/portable/os-impl-no-select.c @@ -52,8 +52,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_SelectSingle_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -62,11 +60,9 @@ int32 OS_SelectSingle_Impl(const OS_object_token_t *token, uint32 *SelectFlags, int32 msecs) { return OS_ERR_NOT_IMPLEMENTED; -} /* end OS_SelectSingle_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SelectMultiple_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -75,4 +71,4 @@ int32 OS_SelectSingle_Impl(const OS_object_token_t *token, uint32 *SelectFlags, int32 OS_SelectMultiple_Impl(OS_FdSet *ReadSet, OS_FdSet *WriteSet, int32 msecs) { return OS_ERR_NOT_IMPLEMENTED; -} /* end OS_SelectMultiple_Impl */ +} diff --git a/src/os/portable/os-impl-no-shell.c b/src/os/portable/os-impl-no-shell.c index c95b853ee..864191d3c 100644 --- a/src/os/portable/os-impl-no-shell.c +++ b/src/os/portable/os-impl-no-shell.c @@ -25,8 +25,6 @@ #include "os-shared-shell.h" /*---------------------------------------------------------------- - * - * Function: OS_ShellOutputToFile_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail diff --git a/src/os/portable/os-impl-posix-dirs.c b/src/os/portable/os-impl-posix-dirs.c index 60d3453ba..82fc8c7af 100644 --- a/src/os/portable/os-impl-posix-dirs.c +++ b/src/os/portable/os-impl-posix-dirs.c @@ -62,8 +62,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_DirCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -93,11 +91,9 @@ int32 OS_DirCreate_Impl(const char *local_path, uint32 access) } return return_code; -} /* end OS_DirCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirOpen_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -117,11 +113,9 @@ int32 OS_DirOpen_Impl(const OS_object_token_t *token, const char *local_path) impl->dp = dp; return OS_SUCCESS; -} /* end OS_DirOpen_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirClose_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -137,11 +131,9 @@ int32 OS_DirClose_Impl(const OS_object_token_t *token) impl->dp = NULL; return OS_SUCCESS; -} /* end OS_DirClose_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirRead_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -172,11 +164,9 @@ int32 OS_DirRead_Impl(const OS_object_token_t *token, os_dirent_t *dirent) dirent->FileName[sizeof(dirent->FileName) - 1] = 0; return OS_SUCCESS; -} /* end OS_DirRead_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirRewind_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -188,11 +178,9 @@ int32 OS_DirRewind_Impl(const OS_object_token_t *token) impl = OS_OBJECT_TABLE_GET(OS_impl_dir_table, *token); rewinddir(impl->dp); return OS_SUCCESS; -} /* end OS_DirRewind_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirRemove_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -206,4 +194,4 @@ int32 OS_DirRemove_Impl(const char *local_path) } return OS_SUCCESS; -} /* end OS_DirRemove_Impl */ +} diff --git a/src/os/portable/os-impl-posix-dl-loader.c b/src/os/portable/os-impl-posix-dl-loader.c index b70c5d0bb..a416fbb51 100644 --- a/src/os/portable/os-impl-posix-dl-loader.c +++ b/src/os/portable/os-impl-posix-dl-loader.c @@ -53,8 +53,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ModuleLoad_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -110,12 +108,9 @@ int32 OS_ModuleLoad_Impl(const OS_object_token_t *token, const char *translated_ } return status; - -} /* end OS_ModuleLoad_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleUnload_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -143,12 +138,9 @@ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token) } return status; - -} /* end OS_ModuleUnload_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -167,5 +159,4 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo * the parent/shared layer information is still valid. */ return OS_SUCCESS; - -} /* end OS_ModuleGetInfo_Impl */ +} diff --git a/src/os/portable/os-impl-posix-dl-symtab.c b/src/os/portable/os-impl-posix-dl-symtab.c index 7e8513078..174e4e157 100644 --- a/src/os/portable/os-impl-posix-dl-symtab.c +++ b/src/os/portable/os-impl-posix-dl-symtab.c @@ -76,8 +76,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_GenericSymbolLookup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -131,8 +129,6 @@ int32 OS_GenericSymbolLookup_Impl(void *dl_handle, cpuaddr *SymbolAddress, const } /*---------------------------------------------------------------- - * - * Function: OS_SymbolLookup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -164,12 +160,9 @@ int32 OS_SymbolLookup_Impl(cpuaddr *SymbolAddress, const char *SymbolName) } return status; - -} /* end OS_SymbolLookup_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleSymbolLookup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -185,12 +178,9 @@ int32 OS_ModuleSymbolLookup_Impl(const OS_object_token_t *token, cpuaddr *Symbol status = OS_GenericSymbolLookup_Impl(impl->dl_handle, SymbolAddress, SymbolName); return status; - -} /* end OS_ModuleSymbolLookup_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SymbolTableDump_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -213,5 +203,4 @@ int32 OS_SymbolTableDump_Impl(const char *filename, size_t SizeLimit) */ return OS_ERR_NOT_IMPLEMENTED; - -} /* end OS_SymbolTableDump_Impl */ +} diff --git a/src/os/portable/os-impl-posix-files.c b/src/os/portable/os-impl-posix-files.c index 3ae5d9627..326b27ea2 100644 --- a/src/os/portable/os-impl-posix-files.c +++ b/src/os/portable/os-impl-posix-files.c @@ -58,8 +58,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_FileOpen_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -120,11 +118,9 @@ int32 OS_FileOpen_Impl(const OS_object_token_t *token, const char *local_path, i impl->selectable = ((os_perm & O_NONBLOCK) != 0); return OS_SUCCESS; -} /* end OS_FileOpen_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileStat_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -211,11 +207,9 @@ int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *FileStats) } return OS_SUCCESS; -} /* end OS_FileStat_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileChmod_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -332,12 +326,9 @@ int32 OS_FileChmod_Impl(const char *local_path, uint32 access_mode) close(fd); return status; - -} /* end OS_FileChmod_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileRemove_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -351,11 +342,9 @@ int32 OS_FileRemove_Impl(const char *local_path) } return OS_SUCCESS; -} /* end OS_FileRemove_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileRename_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -369,4 +358,4 @@ int32 OS_FileRename_Impl(const char *old_path, const char *new_path) } return OS_SUCCESS; -} /* end OS_FileRename_Impl */ +} diff --git a/src/os/portable/os-impl-posix-gettime.c b/src/os/portable/os-impl-posix-gettime.c index cd7aabebc..2f3e9052e 100644 --- a/src/os/portable/os-impl-posix-gettime.c +++ b/src/os/portable/os-impl-posix-gettime.c @@ -60,8 +60,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_GetLocalTime_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -87,11 +85,9 @@ int32 OS_GetLocalTime_Impl(OS_time_t *time_struct) } return ReturnCode; -} /* end OS_GetLocalTime_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SetLocalTime_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -118,5 +114,4 @@ int32 OS_SetLocalTime_Impl(const OS_time_t *time_struct) } return ReturnCode; - -} /* end OS_SetLocalTime_Impl */ +} diff --git a/src/os/portable/os-impl-posix-io.c b/src/os/portable/os-impl-posix-io.c index f887426ea..5d9dc3b1e 100644 --- a/src/os/portable/os-impl-posix-io.c +++ b/src/os/portable/os-impl-posix-io.c @@ -58,8 +58,6 @@ #endif /*---------------------------------------------------------------- - * - * Function: OS_GenericClose_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -90,11 +88,9 @@ int32 OS_GenericClose_Impl(const OS_object_token_t *token) } impl->fd = -1; return OS_SUCCESS; -} /* end OS_GenericClose_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_GenericSeek_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -158,11 +154,9 @@ int32 OS_GenericSeek_Impl(const OS_object_token_t *token, int32 offset, uint32 w } return retval; -} /* end OS_GenericSeek_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_GenericRead_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -213,11 +207,9 @@ int32 OS_GenericRead_Impl(const OS_object_token_t *token, void *buffer, size_t n } return return_code; -} /* end OS_GenericRead_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_GenericWrite_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -270,4 +262,4 @@ int32 OS_GenericWrite_Impl(const OS_object_token_t *token, const void *buffer, s } return return_code; -} /* end OS_GenericWrite_Impl */ +} diff --git a/src/os/portable/os-impl-posix-network.c b/src/os/portable/os-impl-posix-network.c index 637f4c244..5c028b50f 100644 --- a/src/os/portable/os-impl-posix-network.c +++ b/src/os/portable/os-impl-posix-network.c @@ -49,8 +49,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetHostName_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -75,11 +73,9 @@ int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len) } return return_code; -} /* end OS_NetworkGetHostName_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetID_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -90,4 +86,4 @@ int32 OS_NetworkGetID_Impl(int32 *IdBuf) /* gethostid() has no failure modes */ *IdBuf = gethostid(); return OS_SUCCESS; -} /* end OS_NetworkGetID_Impl */ +} diff --git a/src/os/posix/inc/os-impl-timebase.h b/src/os/posix/inc/os-impl-timebase.h index 72ed7dfea..c9810e7bc 100644 --- a/src/os/posix/inc/os-impl-timebase.h +++ b/src/os/posix/inc/os-impl-timebase.h @@ -39,7 +39,6 @@ typedef struct sigset_t sigset; sig_atomic_t reset_flag; struct timespec softsleep; - } OS_impl_timebase_internal_record_t; /**************************************************************************************** diff --git a/src/os/posix/src/os-impl-binsem.c b/src/os/posix/src/os-impl-binsem.c index cc11cf21f..8c2bb954e 100644 --- a/src/os/posix/src/os-impl-binsem.c +++ b/src/os/posix/src/os-impl-binsem.c @@ -107,11 +107,9 @@ int32 OS_Posix_BinSemAPI_Impl_Init(void) { memset(OS_impl_bin_sem_table, 0, sizeof(OS_impl_bin_sem_table)); return OS_SUCCESS; -} /* end OS_Posix_BinSemAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -239,12 +237,9 @@ int32 OS_BinSemCreate_Impl(const OS_object_token_t *token, uint32 initial_value, } return return_code; - -} /* end OS_BinSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -279,11 +274,9 @@ int32 OS_BinSemDelete_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_BinSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -324,11 +317,9 @@ int32 OS_BinSemGive_Impl(const OS_object_token_t *token) pthread_mutex_unlock(&(sem->id)); return OS_SUCCESS; -} /* end OS_BinSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemFlush_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -358,7 +349,7 @@ int32 OS_BinSemFlush_Impl(const OS_object_token_t *token) pthread_mutex_unlock(&(sem->id)); return OS_SUCCESS; -} /* end OS_BinSemFlush_Impl */ +} /*--------------------------------------------------------------------------------------- Name: OS_GenericBinSemTake_Impl @@ -444,11 +435,9 @@ static int32 OS_GenericBinSemTake_Impl(const OS_object_token_t *token, const str pthread_cleanup_pop(true); return return_code; -} /* end OS_GenericBinSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -457,11 +446,9 @@ static int32 OS_GenericBinSemTake_Impl(const OS_object_token_t *token, const str int32 OS_BinSemTake_Impl(const OS_object_token_t *token) { return (OS_GenericBinSemTake_Impl(token, NULL)); -} /* end OS_BinSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemTimedWait_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -477,11 +464,9 @@ int32 OS_BinSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs) OS_Posix_CompAbsDelayTime(msecs, &ts); return (OS_GenericBinSemTake_Impl(token, &ts)); -} /* end OS_BinSemTimedWait_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -496,4 +481,4 @@ int32 OS_BinSemGetInfo_Impl(const OS_object_token_t *token, OS_bin_sem_prop_t *s /* put the info into the structure */ sem_prop->value = sem->current_value; return OS_SUCCESS; -} /* end OS_BinSemGetInfo_Impl */ +} diff --git a/src/os/posix/src/os-impl-common.c b/src/os/posix/src/os-impl-common.c index be87ddb61..746815d64 100644 --- a/src/os/posix/src/os-impl-common.c +++ b/src/os/posix/src/os-impl-common.c @@ -99,11 +99,9 @@ int32 OS_API_Impl_Init(osal_objtype_t idtype) } return return_code; -} /* end OS_API_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_IdleLoop_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -120,11 +118,9 @@ void OS_IdleLoop_Impl(void) * timebase objects have a dedicated thread that will be doing "sigwait" on those. */ sigsuspend(&POSIX_GlobalVars.NormalSigMask); -} /* end OS_IdleLoop_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ApplicationShutdown_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -137,11 +133,9 @@ void OS_ApplicationShutdown_Impl(void) * which should break it out of the sigsuspend() call. */ kill(getpid(), SIGHUP); -} /* end OS_ApplicationShutdown_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CompAbsDelayTime * * Purpose: Local helper function * @@ -164,4 +158,4 @@ void OS_Posix_CompAbsDelayTime(uint32 msecs, struct timespec *tm) tm->tv_nsec -= 1000000000L; tm->tv_sec++; } -} /* end OS_CompAbsDelayTime */ +} diff --git a/src/os/posix/src/os-impl-condvar.c b/src/os/posix/src/os-impl-condvar.c index ce247b2e4..65d0b97c0 100644 --- a/src/os/posix/src/os-impl-condvar.c +++ b/src/os/posix/src/os-impl-condvar.c @@ -49,8 +49,6 @@ static void OS_Posix_CondVarReleaseMutex(void *mut) ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Posix_CondVarAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -62,8 +60,6 @@ int32 OS_Posix_CondVarAPI_Impl_Init(void) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -108,8 +104,6 @@ int32 OS_CondVarCreate_Impl(const OS_object_token_t *token, uint32 options) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -140,8 +134,6 @@ int32 OS_CondVarDelete_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarUnlock_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -164,8 +156,6 @@ int32 OS_CondVarUnlock_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarLock_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -188,8 +178,6 @@ int32 OS_CondVarLock_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarSignal_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -212,8 +200,6 @@ int32 OS_CondVarSignal_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarBroadcast_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -236,8 +222,6 @@ int32 OS_CondVarBroadcast_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarWait_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -269,8 +253,6 @@ int32 OS_CondVarWait_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarTimedWait_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -304,8 +286,6 @@ int32 OS_CondVarTimedWait_Impl(const OS_object_token_t *token, const OS_time_t * } /*---------------------------------------------------------------- - * - * Function: OS_CondVarGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail diff --git a/src/os/posix/src/os-impl-console.c b/src/os/posix/src/os-impl-console.c index 919776998..1795a9cac 100644 --- a/src/os/posix/src/os-impl-console.c +++ b/src/os/posix/src/os-impl-console.c @@ -53,8 +53,6 @@ OS_impl_console_internal_record_t OS_impl_console_table[OS_MAX_CONSOLES]; /********************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ConsoleWakeup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -68,12 +66,9 @@ void OS_ConsoleWakeup_Impl(const OS_object_token_t *token) /* post the sem for the utility task to run */ sem_post(&local->data_sem); - -} /* end OS_ConsoleWakeup_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ConsoleTask_Entry * * Purpose: Local Helper function * Implements the console output task @@ -99,11 +94,9 @@ static void *OS_ConsoleTask_Entry(void *arg) OS_ObjectIdRelease(&token); } return NULL; -} /* end OS_ConsoleTask_Entry */ +} /*---------------------------------------------------------------- - * - * Function: OS_ConsoleCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -150,4 +143,4 @@ int32 OS_ConsoleCreate_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_ConsoleCreate_Impl */ +} diff --git a/src/os/posix/src/os-impl-countsem.c b/src/os/posix/src/os-impl-countsem.c index ec0153e77..64998f5d4 100644 --- a/src/os/posix/src/os-impl-countsem.c +++ b/src/os/posix/src/os-impl-countsem.c @@ -63,11 +63,9 @@ int32 OS_Posix_CountSemAPI_Impl_Init(void) { memset(OS_impl_count_sem_table, 0, sizeof(OS_impl_count_sem_table)); return OS_SUCCESS; -} /* end OS_Posix_CountSemAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -90,12 +88,9 @@ int32 OS_CountSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_ } return OS_SUCCESS; - -} /* end OS_CountSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -113,12 +108,9 @@ int32 OS_CountSemDelete_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_CountSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -136,12 +128,9 @@ int32 OS_CountSemGive_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_CountSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -159,11 +148,9 @@ int32 OS_CountSemTake_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_CountSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemTimedWait_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -197,11 +184,9 @@ int32 OS_CountSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs) } return result; -} /* end OS_CountSemTimedWait_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -222,4 +207,4 @@ int32 OS_CountSemGetInfo_Impl(const OS_object_token_t *token, OS_count_sem_prop_ /* put the info into the structure */ count_prop->value = sval; return OS_SUCCESS; -} /* end OS_CountSemGetInfo_Impl */ +} diff --git a/src/os/posix/src/os-impl-dirs.c b/src/os/posix/src/os-impl-dirs.c index 93a3e9c78..8be0c4e53 100644 --- a/src/os/posix/src/os-impl-dirs.c +++ b/src/os/posix/src/os-impl-dirs.c @@ -62,4 +62,4 @@ int32 OS_Posix_DirAPI_Impl_Init(void) { memset(OS_impl_dir_table, 0, sizeof(OS_impl_dir_table)); return OS_SUCCESS; -} /* end OS_Posix_DirAPI_Impl_Init */ +} diff --git a/src/os/posix/src/os-impl-files.c b/src/os/posix/src/os-impl-files.c index 5c98cc9d7..601ca942c 100644 --- a/src/os/posix/src/os-impl-files.c +++ b/src/os/posix/src/os-impl-files.c @@ -98,4 +98,4 @@ int32 OS_Posix_StreamAPI_Impl_Init(void) OS_IMPL_SELF_EGID = getegid(); return OS_SUCCESS; -} /* end OS_Posix_StreamAPI_Impl_Init */ +} diff --git a/src/os/posix/src/os-impl-filesys.c b/src/os/posix/src/os-impl-filesys.c index 07661a4ba..fb6ff722a 100644 --- a/src/os/posix/src/os-impl-filesys.c +++ b/src/os/posix/src/os-impl-filesys.c @@ -67,15 +67,13 @@ const char OS_POSIX_DEVICEFILE_PREFIX[] = "/dev/"; int32 OS_Posix_FileSysAPI_Impl_Init(void) { return OS_SUCCESS; -} /* end OS_Posix_FileSysAPI_Impl_Init */ +} /* * System Level API */ /*---------------------------------------------------------------- - * - * Function: OS_FileSysStartVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -174,12 +172,9 @@ int32 OS_FileSysStartVolume_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_FileSysStartVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysStopVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -197,12 +192,9 @@ int32 OS_FileSysStopVolume_Impl(const OS_object_token_t *token) * If the volume is started again, the directory will be re-used. */ return OS_SUCCESS; - -} /* end OS_FileSysStopVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysFormatVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -220,12 +212,9 @@ int32 OS_FileSysFormatVolume_Impl(const OS_object_token_t *token) * (this is also backward compatible since POSIX mkfs was always a no-op) */ return OS_SUCCESS; - -} /* end OS_FileSysFormatVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysMountVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -274,12 +263,9 @@ int32 OS_FileSysMountVolume_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_FileSysMountVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysUnmountVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -295,12 +281,9 @@ int32 OS_FileSysUnmountVolume_Impl(const OS_object_token_t *token) * the mount process can stay for the next mount. */ return OS_SUCCESS; - -} /* end OS_FileSysUnmountVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysStatVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -323,11 +306,9 @@ int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *re result->total_blocks = OSAL_BLOCKCOUNT_C(stat_buf.f_blocks); return OS_SUCCESS; -} /* end OS_FileSysStatVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysCheckVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -336,4 +317,4 @@ int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *re int32 OS_FileSysCheckVolume_Impl(const OS_object_token_t *token, bool repair) { return OS_ERR_NOT_IMPLEMENTED; -} /* end OS_FileSysCheckVolume_Impl */ +} diff --git a/src/os/posix/src/os-impl-heap.c b/src/os/posix/src/os-impl-heap.c index 64c5dc5bb..42aab3be7 100644 --- a/src/os/posix/src/os-impl-heap.c +++ b/src/os/posix/src/os-impl-heap.c @@ -31,8 +31,6 @@ #include "os-shared-heap.h" /*---------------------------------------------------------------- - * - * Function: OS_HeapGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -44,4 +42,4 @@ int32 OS_HeapGetInfo_Impl(OS_heap_prop_t *heap_prop) ** Not implemented yet */ return OS_ERR_NOT_IMPLEMENTED; -} /* end OS_HeapGetInfo_Impl */ +} diff --git a/src/os/posix/src/os-impl-idmap.c b/src/os/posix/src/os-impl-idmap.c index b121b8179..e0448c763 100644 --- a/src/os/posix/src/os-impl-idmap.c +++ b/src/os/posix/src/os-impl-idmap.c @@ -75,8 +75,6 @@ void OS_Posix_ReleaseTableMutex(void *mut) } /*---------------------------------------------------------------- - * - * Function: OS_Lock_Global_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -94,12 +92,9 @@ void OS_Lock_Global_Impl(osal_objtype_t idtype) { OS_DEBUG("pthread_mutex_lock(&impl->mutex): %s", strerror(ret)); } - -} /* end OS_Lock_Global_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_Unlock_Global_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -125,12 +120,9 @@ void OS_Unlock_Global_Impl(osal_objtype_t idtype) { OS_DEBUG("pthread_mutex_unlock(&impl->mutex): %s", strerror(ret)); } - -} /* end OS_Unlock_Global_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_WaitForStateChange_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -249,4 +241,4 @@ int32 OS_Posix_TableMutex_Init(osal_objtype_t idtype) } while (0); return return_code; -} /* end OS_Posix_TableMutex_Init */ +} diff --git a/src/os/posix/src/os-impl-loader.c b/src/os/posix/src/os-impl-loader.c index 747fa59c7..6857fa143 100644 --- a/src/os/posix/src/os-impl-loader.c +++ b/src/os/posix/src/os-impl-loader.c @@ -35,8 +35,6 @@ OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES]; /*---------------------------------------------------------------- - * - * Function: OS_Posix_ModuleAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -45,4 +43,4 @@ int32 OS_Posix_ModuleAPI_Impl_Init(void) { memset(OS_impl_module_table, 0, sizeof(OS_impl_module_table)); return OS_SUCCESS; -} /* end OS_Posix_ModuleAPI_Impl_Init */ +} diff --git a/src/os/posix/src/os-impl-mutex.c b/src/os/posix/src/os-impl-mutex.c index c8c0c51d6..47be119bc 100644 --- a/src/os/posix/src/os-impl-mutex.c +++ b/src/os/posix/src/os-impl-mutex.c @@ -40,8 +40,6 @@ OS_impl_mutex_internal_record_t OS_impl_mutex_table[OS_MAX_MUTEXES]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Posix_MutexAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -50,11 +48,9 @@ int32 OS_Posix_MutexAPI_Impl_Init(void) { memset(OS_impl_mutex_table, 0, sizeof(OS_impl_mutex_table)); return OS_SUCCESS; -} /* end OS_Posix_MutexAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -114,11 +110,9 @@ int32 OS_MutSemCreate_Impl(const OS_object_token_t *token, uint32 options) } return OS_SUCCESS; -} /* end OS_MutSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -139,12 +133,9 @@ int32 OS_MutSemDelete_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_MutSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -167,11 +158,9 @@ int32 OS_MutSemGive_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_MutSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -194,11 +183,9 @@ int32 OS_MutSemTake_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_MutSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -207,5 +194,4 @@ int32 OS_MutSemTake_Impl(const OS_object_token_t *token) int32 OS_MutSemGetInfo_Impl(const OS_object_token_t *token, OS_mut_sem_prop_t *mut_prop) { return OS_SUCCESS; - -} /* end OS_MutSemGetInfo_Impl */ +} diff --git a/src/os/posix/src/os-impl-no-module.c b/src/os/posix/src/os-impl-no-module.c index 72056893f..2f444759f 100644 --- a/src/os/posix/src/os-impl-no-module.c +++ b/src/os/posix/src/os-impl-no-module.c @@ -34,8 +34,6 @@ #include "os-shared-module.h" /*---------------------------------------------------------------- - * - * Function: OS_Posix_ModuleAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -44,4 +42,4 @@ int32 OS_Posix_ModuleAPI_Impl_Init(void) { /* nothing to init in this mode */ return OS_SUCCESS; -} /* end OS_Posix_ModuleAPI_Impl_Init */ +} diff --git a/src/os/posix/src/os-impl-queues.c b/src/os/posix/src/os-impl-queues.c index 6148895e7..cef6f3a54 100644 --- a/src/os/posix/src/os-impl-queues.c +++ b/src/os/posix/src/os-impl-queues.c @@ -69,11 +69,9 @@ int32 OS_Posix_QueueAPI_Impl_Init(void) #endif return OS_SUCCESS; -} /* end OS_Posix_QueueAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -152,11 +150,9 @@ int32 OS_QueueCreate_Impl(const OS_object_token_t *token, uint32 flags) } return return_code; -} /* end OS_QueueCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -181,11 +177,9 @@ int32 OS_QueueDelete_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_QueueDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueGet_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -280,11 +274,9 @@ int32 OS_QueueGet_Impl(const OS_object_token_t *token, void *data, size_t size, } return return_code; -} /* end OS_QueueGet_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueuePut_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -328,5 +320,4 @@ int32 OS_QueuePut_Impl(const OS_object_token_t *token, const void *data, size_t } return return_code; - -} /* end OS_QueuePut_Impl */ +} diff --git a/src/os/posix/src/os-impl-shell.c b/src/os/posix/src/os-impl-shell.c index 9a115c94b..617447cdf 100644 --- a/src/os/posix/src/os-impl-shell.c +++ b/src/os/posix/src/os-impl-shell.c @@ -49,8 +49,6 @@ ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ShellOutputToFile_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -110,4 +108,4 @@ int32 OS_ShellOutputToFile_Impl(const OS_object_token_t *token, const char *Cmd) } return OS_SUCCESS; -} /* end OS_ShellOutputToFile_Impl */ +} diff --git a/src/os/posix/src/os-impl-tasks.c b/src/os/posix/src/os-impl-tasks.c index 6ac5b154b..a90a8c9c7 100644 --- a/src/os/posix/src/os-impl-tasks.c +++ b/src/os/posix/src/os-impl-tasks.c @@ -90,11 +90,9 @@ static int OS_PriorityRemap(osal_priority_t InputPri) } return OutputPri; -} /* end OS_PriorityRemap */ +} /*---------------------------------------------------------------- - * - * Function: OS_NoopSigHandler * * Purpose: Local helper routine, not part of OSAL API. * A POSIX signal handler that does nothing @@ -187,7 +185,7 @@ static bool OS_Posix_GetSchedulerParams(int sched_policy, POSIX_PriorityLimits_t OS_DEBUG("Policy %d: available, min-max: %d-%d\n", sched_policy, (int)PriLim->PriorityMin, (int)PriLim->PriorityMax); return true; -} /* end OS_Posix_GetSchedulerParams */ +} /* ********************************************************************************* @@ -425,11 +423,9 @@ int32 OS_Posix_TaskAPI_Impl_Init(void) POSIX_GlobalVars.PageSize = ret_long; return OS_SUCCESS; -} /* end OS_Posix_TaskAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_Posix_InternalTaskCreate_Impl * * Purpose: Local helper routine, not part of OSAL API. * @@ -563,11 +559,9 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority } return OS_SUCCESS; -} /* end OS_Posix_InternalTaskCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -590,11 +584,9 @@ int32 OS_TaskCreate_Impl(const OS_object_token_t *token, uint32 flags) arg.opaque_arg); return return_code; -} /* end OS_TaskCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDetach_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -620,8 +612,6 @@ int32 OS_TaskDetach_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_TaskMatch_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -639,11 +629,9 @@ int32 OS_TaskMatch_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_TaskMatch_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -693,12 +681,9 @@ int32 OS_TaskDelete_Impl(const OS_object_token_t *token) } } return OS_SUCCESS; - -} /* end OS_TaskDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskExit_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -707,12 +692,9 @@ int32 OS_TaskDelete_Impl(const OS_object_token_t *token) void OS_TaskExit_Impl() { pthread_exit(NULL); - -} /* end OS_TaskExit_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDelay_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -746,11 +728,9 @@ int32 OS_TaskDelay_Impl(uint32 millisecond) { return OS_SUCCESS; } -} /* end OS_TaskDelay_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskSetPriority_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -783,11 +763,9 @@ int32 OS_TaskSetPriority_Impl(const OS_object_token_t *token, osal_priority_t ne } return OS_SUCCESS; -} /* end OS_TaskSetPriority_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskRegister_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -824,11 +802,9 @@ int32 OS_TaskRegister_Impl(osal_id_t global_task_id) } return return_code; -} /* end OS_TaskRegister_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetId_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -841,11 +817,9 @@ osal_id_t OS_TaskGetId_Impl(void) self_record.opaque_arg = pthread_getspecific(POSIX_GlobalVars.ThreadKey); return self_record.id; -} /* end OS_TaskGetId_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -854,11 +828,9 @@ osal_id_t OS_TaskGetId_Impl(void) int32 OS_TaskGetInfo_Impl(const OS_object_token_t *token, OS_task_prop_t *task_prop) { return OS_SUCCESS; -} /* end OS_TaskGetInfo_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskIdMatchSystemData_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -875,8 +847,6 @@ bool OS_TaskIdMatchSystemData_Impl(void *ref, const OS_object_token_t *token, co } /*---------------------------------------------------------------- - * - * Function: OS_TaskValidateSystemData_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail diff --git a/src/os/posix/src/os-impl-timebase.c b/src/os/posix/src/os-impl-timebase.c index 16e59d349..6b4da6bd2 100644 --- a/src/os/posix/src/os-impl-timebase.c +++ b/src/os/posix/src/os-impl-timebase.c @@ -77,8 +77,6 @@ OS_impl_timebase_internal_record_t OS_impl_timebase_table[OS_MAX_TIMEBASES]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_UsecToTimespec * * Purpose: Local helper routine, not part of OSAL API. * Convert Microseconds to a POSIX timespec structure. @@ -86,7 +84,6 @@ OS_impl_timebase_internal_record_t OS_impl_timebase_table[OS_MAX_TIMEBASES]; *-----------------------------------------------------------------*/ static void OS_UsecToTimespec(uint32 usecs, struct timespec *time_spec) { - if (usecs < 1000000) { time_spec->tv_nsec = (usecs * 1000); @@ -97,11 +94,9 @@ static void OS_UsecToTimespec(uint32 usecs, struct timespec *time_spec) time_spec->tv_sec = usecs / 1000000; time_spec->tv_nsec = (usecs % 1000000) * 1000; } -} /* end OS_UsecToTimespec */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseLock_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -114,11 +109,9 @@ void OS_TimeBaseLock_Impl(const OS_object_token_t *token) impl = OS_OBJECT_TABLE_GET(OS_impl_timebase_table, *token); pthread_mutex_lock(&impl->handler_mutex); -} /* end OS_TimeBaseLock_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseUnlock_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -131,11 +124,9 @@ void OS_TimeBaseUnlock_Impl(const OS_object_token_t *token) impl = OS_OBJECT_TABLE_GET(OS_impl_timebase_table, *token); pthread_mutex_unlock(&impl->handler_mutex); -} /* end OS_TimeBaseUnlock_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBase_SoftWaitImpl * * Purpose: Local helper routine, not part of OSAL API. * @@ -186,14 +177,13 @@ static uint32 OS_TimeBase_SigWaitImpl(osal_id_t obj_id) } return interval_time; -} /* end OS_TimeBase_SoftWaitImpl */ +} /**************************************************************************************** INITIALIZATION FUNCTION ***************************************************************************************/ /****************************************************************************** - * Function: OS_Posix_TimeBaseAPI_Impl_Init * * Purpose: Initialize the timer implementation layer * @@ -305,7 +295,7 @@ int32 OS_Posix_TimeBaseAPI_Impl_Init(void) } while (0); return return_code; -} /* end OS_Posix_TimeBaseAPI_Impl_Init */ +} /**************************************************************************************** Time Base API @@ -321,8 +311,6 @@ static void *OS_TimeBasePthreadEntry(void *arg) } /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -484,11 +472,9 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_TimeBaseCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseSet_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -540,11 +526,9 @@ int32 OS_TimeBaseSet_Impl(const OS_object_token_t *token, uint32 start_time, uin local->reset_flag = (return_code == OS_SUCCESS); return return_code; -} /* end OS_TimeBaseSet_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -575,11 +559,9 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_TimeBaseDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -588,5 +570,4 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token) int32 OS_TimeBaseGetInfo_Impl(const OS_object_token_t *token, OS_timebase_prop_t *timer_prop) { return OS_SUCCESS; - -} /* end OS_TimeBaseGetInfo_Impl */ +} diff --git a/src/os/rtems/inc/os-impl-timebase.h b/src/os/rtems/inc/os-impl-timebase.h index e8d1785fb..a47853f2c 100644 --- a/src/os/rtems/inc/os-impl-timebase.h +++ b/src/os/rtems/inc/os-impl-timebase.h @@ -39,7 +39,6 @@ typedef struct sigset_t sigset; sig_atomic_t reset_flag; struct timespec softsleep; - } OS_impl_timebase_internal_record_t; /**************************************************************************************** diff --git a/src/os/rtems/src/os-impl-binsem.c b/src/os/rtems/src/os-impl-binsem.c index 645fb891f..c530ee618 100644 --- a/src/os/rtems/src/os-impl-binsem.c +++ b/src/os/rtems/src/os-impl-binsem.c @@ -65,8 +65,6 @@ OS_impl_binsem_internal_record_t OS_impl_bin_sem_table[OS_MAX_BIN_SEMAPHORES]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Rtems_BinSemAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -75,11 +73,9 @@ int32 OS_Rtems_BinSemAPI_Impl_Init(void) { memset(OS_impl_bin_sem_table, 0, sizeof(OS_impl_bin_sem_table)); return OS_SUCCESS; -} /* end OS_Rtems_BinSemAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -117,12 +113,9 @@ int32 OS_BinSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_va } return OS_SUCCESS; - -} /* end OS_BinSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -143,12 +136,9 @@ int32 OS_BinSemDelete_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_BinSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -169,11 +159,9 @@ int32 OS_BinSemGive_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_BinSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemFlush_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -195,12 +183,9 @@ int32 OS_BinSemFlush_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_BinSemFlush_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -229,12 +214,9 @@ int32 OS_BinSemTake_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_BinSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemTimedWait_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -268,12 +250,9 @@ int32 OS_BinSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs) } return OS_SUCCESS; - -} /* end OS_BinSemTimedWait_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -283,4 +262,4 @@ int32 OS_BinSemGetInfo_Impl(const OS_object_token_t *token, OS_bin_sem_prop_t *b { /* RTEMS has no API for obtaining the current value of a semaphore */ return OS_SUCCESS; -} /* end OS_BinSemGetInfo_Impl */ +} diff --git a/src/os/rtems/src/os-impl-common.c b/src/os/rtems/src/os-impl-common.c index 92854e807..a148a7c19 100644 --- a/src/os/rtems/src/os-impl-common.c +++ b/src/os/rtems/src/os-impl-common.c @@ -98,11 +98,9 @@ int32 OS_API_Impl_Init(osal_objtype_t idtype) } return return_code; -} /* end OS_API_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_IdleLoop_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -112,11 +110,9 @@ void OS_IdleLoop_Impl() { RTEMS_GlobalVars.IdleTaskId = rtems_task_self(); rtems_task_suspend(RTEMS_SELF); -} /* end OS_IdleLoop_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ApplicationShutdown_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -129,4 +125,4 @@ void OS_ApplicationShutdown_Impl() * is a remote chance that this could attempt to * resume a task that is not yet suspended. */ rtems_task_resume(RTEMS_GlobalVars.IdleTaskId); -} /* end OS_ApplicationShutdown_Impl */ +} diff --git a/src/os/rtems/src/os-impl-console.c b/src/os/rtems/src/os-impl-console.c index ba51baf45..fdbfc0cb3 100644 --- a/src/os/rtems/src/os-impl-console.c +++ b/src/os/rtems/src/os-impl-console.c @@ -77,8 +77,6 @@ OS_impl_console_internal_record_t OS_impl_console_table[OS_MAX_CONSOLES]; /********************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ConsoleWakeup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -92,12 +90,9 @@ void OS_ConsoleWakeup_Impl(const OS_object_token_t *token) /* post the sem for the utility task to run */ rtems_semaphore_release(local->data_sem); - -} /* end OS_ConsoleWakeup_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ConsoleTask_Entry * * Purpose: Local helper routine, not part of OSAL API. * @@ -120,11 +115,9 @@ static void OS_ConsoleTask_Entry(rtems_task_argument arg) } OS_ObjectIdRelease(&token); } -} /* end OS_ConsoleTask_Entry */ +} /*---------------------------------------------------------------- - * - * Function: OS_ConsoleCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -200,4 +193,4 @@ int32 OS_ConsoleCreate_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_ConsoleCreate_Impl */ +} diff --git a/src/os/rtems/src/os-impl-countsem.c b/src/os/rtems/src/os-impl-countsem.c index 548558870..2f9533818 100644 --- a/src/os/rtems/src/os-impl-countsem.c +++ b/src/os/rtems/src/os-impl-countsem.c @@ -62,8 +62,6 @@ OS_impl_countsem_internal_record_t OS_impl_count_sem_table[OS_MAX_COUNT_SEMAPHORES]; /*---------------------------------------------------------------- - * - * Function: OS_Rtems_CountSemAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -72,11 +70,9 @@ int32 OS_Rtems_CountSemAPI_Impl_Init(void) { memset(OS_impl_count_sem_table, 0, sizeof(OS_impl_count_sem_table)); return OS_SUCCESS; -} /* end OS_Rtems_CountSemAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -114,12 +110,9 @@ int32 OS_CountSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_ } return OS_SUCCESS; - -} /* end OS_CountSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -140,12 +133,9 @@ int32 OS_CountSemDelete_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_CountSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -166,12 +156,9 @@ int32 OS_CountSemGive_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_CountSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -192,12 +179,9 @@ int32 OS_CountSemTake_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_CountSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemTimedWait_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -229,12 +213,9 @@ int32 OS_CountSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs) } return OS_SUCCESS; - -} /* end OS_CountSemTimedWait_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -244,5 +225,4 @@ int32 OS_CountSemGetInfo_Impl(const OS_object_token_t *token, OS_count_sem_prop_ { /* RTEMS does not provide an API to get the value */ return OS_SUCCESS; - -} /* end OS_CountSemGetInfo_Impl */ +} diff --git a/src/os/rtems/src/os-impl-dirs.c b/src/os/rtems/src/os-impl-dirs.c index 00b3cef3e..e7c8cabd5 100644 --- a/src/os/rtems/src/os-impl-dirs.c +++ b/src/os/rtems/src/os-impl-dirs.c @@ -63,4 +63,4 @@ int32 OS_Rtems_DirAPI_Impl_Init(void) { memset(OS_impl_dir_table, 0, sizeof(OS_impl_dir_table)); return OS_SUCCESS; -} /* end OS_Rtems_DirAPI_Impl_Init */ +} diff --git a/src/os/rtems/src/os-impl-files.c b/src/os/rtems/src/os-impl-files.c index 158bbbbc0..eaf32d45f 100644 --- a/src/os/rtems/src/os-impl-files.c +++ b/src/os/rtems/src/os-impl-files.c @@ -73,4 +73,4 @@ int32 OS_Rtems_StreamAPI_Impl_Init(void) } return OS_SUCCESS; -} /* end OS_Rtems_StreamAPI_Impl_Init */ +} diff --git a/src/os/rtems/src/os-impl-filesys.c b/src/os/rtems/src/os-impl-filesys.c index 5e5874877..a7f484fd5 100644 --- a/src/os/rtems/src/os-impl-filesys.c +++ b/src/os/rtems/src/os-impl-filesys.c @@ -58,7 +58,6 @@ typedef struct const char * mount_fstype; rtems_filesystem_options_t mount_options; const void * mount_data; - } OS_impl_filesys_internal_record_t; /**************************************************************************************** @@ -92,11 +91,9 @@ int32 OS_Rtems_FileSysAPI_Impl_Init(void) /* clear the local filesys table */ memset(OS_impl_filesys_table, 0, sizeof(OS_impl_filesys_table)); return OS_SUCCESS; -} /* end OS_Rtems_FileSysAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysStartVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -197,12 +194,9 @@ int32 OS_FileSysStartVolume_Impl(const OS_object_token_t *token) } return return_code; - -} /* end OS_FileSysStartVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysStopVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -223,12 +217,9 @@ int32 OS_FileSysStopVolume_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_FileSysStopVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysFormatVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -288,12 +279,9 @@ int32 OS_FileSysFormatVolume_Impl(const OS_object_token_t *token) } return return_code; - -} /* end OS_FileSysFormatVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysMountVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -345,12 +333,9 @@ int32 OS_FileSysMountVolume_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_FileSysMountVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysUnmountVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -375,12 +360,9 @@ int32 OS_FileSysUnmountVolume_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_FileSysUnmountVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysStatVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -420,11 +402,9 @@ int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *re } return return_code; -} /* end OS_FileSysStatVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysCheckVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -433,4 +413,4 @@ int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *re int32 OS_FileSysCheckVolume_Impl(const OS_object_token_t *token, bool repair) { return OS_ERR_NOT_IMPLEMENTED; -} /* end OS_FileSysCheckVolume_Impl */ +} diff --git a/src/os/rtems/src/os-impl-heap.c b/src/os/rtems/src/os-impl-heap.c index e10ec4c88..86ee7aa70 100644 --- a/src/os/rtems/src/os-impl-heap.c +++ b/src/os/rtems/src/os-impl-heap.c @@ -35,8 +35,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_HeapGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -59,4 +57,4 @@ int32 OS_HeapGetInfo_Impl(OS_heap_prop_t *heap_prop) heap_prop->largest_free_block = (uint32)info.Free.largest; return OS_SUCCESS; -} /* end OS_HeapGetInfo_Impl */ +} diff --git a/src/os/rtems/src/os-impl-idmap.c b/src/os/rtems/src/os-impl-idmap.c index 74c7e9b75..3a34aa59e 100644 --- a/src/os/rtems/src/os-impl-idmap.c +++ b/src/os/rtems/src/os-impl-idmap.c @@ -73,8 +73,6 @@ OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER] = }; /*---------------------------------------------------------------- - * - * Function: OS_Lock_Global_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -92,12 +90,9 @@ void OS_Lock_Global_Impl(osal_objtype_t idtype) { OS_DEBUG("OS_Lock_Global_Impl: rtems_semaphore_obtain failed: %s\n", rtems_status_text(rtems_sc)); } - -} /* end OS_Lock_Global_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_Unlock_Global_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -115,12 +110,9 @@ void OS_Unlock_Global_Impl(osal_objtype_t idtype) { OS_DEBUG("OS_Unlock_Global_Impl: rtems_semaphore_release failed: %s\n", rtems_status_text(rtems_sc)); } - -} /* end OS_Unlock_Global_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_WaitForStateChange_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -176,4 +168,4 @@ int32 OS_Rtems_TableMutex_Init(osal_objtype_t idtype) } return OS_SUCCESS; -} /* end OS_Rtems_TableMutex_Init */ +} diff --git a/src/os/rtems/src/os-impl-loader.c b/src/os/rtems/src/os-impl-loader.c index 4793f3078..dfb5e9651 100644 --- a/src/os/rtems/src/os-impl-loader.c +++ b/src/os/rtems/src/os-impl-loader.c @@ -56,8 +56,6 @@ OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Rtems_ModuleAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -66,15 +64,13 @@ int32 OS_Rtems_ModuleAPI_Impl_Init(void) { memset(OS_impl_module_table, 0, sizeof(OS_impl_module_table)); return OS_SUCCESS; -} /* end OS_Rtems_ModuleAPI_Impl_Init */ +} /**************************************************************************************** HELPER ROUTINES ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_rtems_rtl_check_unresolved * * Purpose: Local helper routine, not part of OSAL API. @@ -100,15 +96,13 @@ static bool OS_rtems_rtl_check_unresolved(OSAL_UNRESOLV_REC_TYPE *rec, void *dat break; } return false; -} /* end OS_rtems_rtl_check_unresolved */ +} /**************************************************************************************** Module Loader API ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ModuleLoad_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -179,12 +173,9 @@ int32 OS_ModuleLoad_Impl(const OS_object_token_t *token, const char *translated_ } return status; - -} /* end OS_ModuleLoad_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleUnload_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -212,12 +203,9 @@ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token) } return status; - -} /* end OS_ModuleUnload_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -266,5 +254,4 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo } return status; - -} /* end OS_ModuleGetInfo_Impl */ +} diff --git a/src/os/rtems/src/os-impl-mutex.c b/src/os/rtems/src/os-impl-mutex.c index 9c037be6f..c317df869 100644 --- a/src/os/rtems/src/os-impl-mutex.c +++ b/src/os/rtems/src/os-impl-mutex.c @@ -63,8 +63,6 @@ OS_impl_mutex_internal_record_t OS_impl_mutex_table[OS_MAX_MUTEXES]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Rtems_MutexAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -73,11 +71,9 @@ int32 OS_Rtems_MutexAPI_Impl_Init(void) { memset(OS_impl_mutex_table, 0, sizeof(OS_impl_mutex_table)); return OS_SUCCESS; -} /* end OS_Rtems_MutexAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -104,12 +100,9 @@ int32 OS_MutSemCreate_Impl(const OS_object_token_t *token, uint32 options) } return OS_SUCCESS; - -} /* end OS_MutSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -131,12 +124,9 @@ int32 OS_MutSemDelete_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_MutSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -159,12 +149,9 @@ int32 OS_MutSemGive_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_MutSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -186,12 +173,9 @@ int32 OS_MutSemTake_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_MutSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -201,5 +185,4 @@ int32 OS_MutSemGetInfo_Impl(const OS_object_token_t *token, OS_mut_sem_prop_t *m { /* RTEMS provides no additional info */ return OS_SUCCESS; - -} /* end OS_MutSemGetInfo_Impl */ +} diff --git a/src/os/rtems/src/os-impl-network.c b/src/os/rtems/src/os-impl-network.c index 4f3d296fe..54eff8848 100644 --- a/src/os/rtems/src/os-impl-network.c +++ b/src/os/rtems/src/os-impl-network.c @@ -32,8 +32,6 @@ #include "os-shared-network.h" /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetID_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -45,11 +43,9 @@ int32 OS_NetworkGetID_Impl(int32 *IdBuf) * it is deprecated in other OS's anyway and not a good idea to use it */ return OS_ERR_NOT_IMPLEMENTED; -} /* end OS_NetworkGetID_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetHostName_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -74,4 +70,4 @@ int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len) } return return_code; -} /* end OS_NetworkGetHostName_Impl */ +} diff --git a/src/os/rtems/src/os-impl-no-module.c b/src/os/rtems/src/os-impl-no-module.c index 144863552..77d6be5e2 100644 --- a/src/os/rtems/src/os-impl-no-module.c +++ b/src/os/rtems/src/os-impl-no-module.c @@ -36,8 +36,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Rtems_ModuleAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -46,4 +44,4 @@ int32 OS_Rtems_ModuleAPI_Impl_Init(void) { /* nothing to init, but needs to return SUCCESS to allow the rest of OSAL to work */ return OS_SUCCESS; -} /* end OS_Rtems_ModuleAPI_Impl_Init */ +} diff --git a/src/os/rtems/src/os-impl-queues.c b/src/os/rtems/src/os-impl-queues.c index af26e40d7..7e6dde2d8 100644 --- a/src/os/rtems/src/os-impl-queues.c +++ b/src/os/rtems/src/os-impl-queues.c @@ -56,8 +56,6 @@ OS_impl_queue_internal_record_t OS_impl_queue_table[OS_MAX_QUEUES]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Rtems_QueueAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -66,11 +64,9 @@ int32 OS_Rtems_QueueAPI_Impl_Init(void) { memset(OS_impl_queue_table, 0, sizeof(OS_impl_queue_table)); return OS_SUCCESS; -} /* end OS_Rtems_QueueAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -116,12 +112,9 @@ int32 OS_QueueCreate_Impl(const OS_object_token_t *token, uint32 flags) } return OS_SUCCESS; - -} /* end OS_QueueCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -143,12 +136,9 @@ int32 OS_QueueDelete_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_QueueDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueGet_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -241,11 +231,9 @@ int32 OS_QueueGet_Impl(const OS_object_token_t *token, void *data, size_t size, } return return_code; -} /* end OS_QueueGet_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueuePut_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -287,12 +275,9 @@ int32 OS_QueuePut_Impl(const OS_object_token_t *token, const void *data, size_t } return OS_SUCCESS; - -} /* end OS_QueuePut_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -302,5 +287,4 @@ int32 OS_QueueGetInfo_Impl(const OS_object_token_t *token, OS_queue_prop_t *queu { /* No extra info for queues in the OS implementation */ return OS_SUCCESS; - -} /* end OS_QueueGetInfo_Impl */ +} diff --git a/src/os/rtems/src/os-impl-tasks.c b/src/os/rtems/src/os-impl-tasks.c index a05ff81d5..64c9e8b7a 100644 --- a/src/os/rtems/src/os-impl-tasks.c +++ b/src/os/rtems/src/os-impl-tasks.c @@ -63,15 +63,13 @@ OS_impl_task_internal_record_t OS_impl_task_table[OS_MAX_TASKS]; static rtems_task OS_RtemsEntry(rtems_task_argument arg) { OS_TaskEntryPoint(OS_ObjectIdFromInteger(arg)); -} /* end OS_RtemsEntry */ +} /**************************************************************************************** TASK API ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Rtems_TaskAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -80,11 +78,9 @@ int32 OS_Rtems_TaskAPI_Impl_Init(void) { memset(OS_impl_task_table, 0, sizeof(OS_impl_task_table)); return OS_SUCCESS; -} /* end OS_Rtems_TaskAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -143,12 +139,9 @@ int32 OS_TaskCreate_Impl(const OS_object_token_t *token, uint32 flags) } return OS_SUCCESS; - -} /* end OS_TaskCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -169,11 +162,9 @@ int32 OS_TaskDelete_Impl(const OS_object_token_t *token) rtems_task_delete(impl->id); return OS_SUCCESS; -} /* end OS_TaskDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDetach_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -186,8 +177,6 @@ int32 OS_TaskDetach_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_TaskExit_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -196,12 +185,9 @@ int32 OS_TaskDetach_Impl(const OS_object_token_t *token) void OS_TaskExit_Impl() { rtems_task_delete(RTEMS_SELF); - -} /* end OS_TaskExit_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDelay_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -231,12 +217,9 @@ int32 OS_TaskDelay_Impl(uint32 milli_second) rtems_task_wake_after((rtems_interval)tick_count); return return_code; - -} /* end OS_TaskDelay_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskSetPriority_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -259,12 +242,9 @@ int32 OS_TaskSetPriority_Impl(const OS_object_token_t *token, osal_priority_t ne } return OS_SUCCESS; - -} /* end OS_TaskSetPriority_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskMatch_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -285,11 +265,9 @@ int32 OS_TaskMatch_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_TaskMatch_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskRegister_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -314,12 +292,9 @@ int32 OS_TaskRegister_Impl(osal_id_t global_task_id) * hash table here. */ return OS_SUCCESS; - -} /* end OS_TaskRegister_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetId_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -355,12 +330,9 @@ osal_id_t OS_TaskGetId_Impl(void) } return global_task_id; - -} /* end OS_TaskGetId_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -369,12 +341,9 @@ osal_id_t OS_TaskGetId_Impl(void) int32 OS_TaskGetInfo_Impl(const OS_object_token_t *token, OS_task_prop_t *task_prop) { return OS_SUCCESS; - -} /* end OS_TaskGetInfo_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskValidateSystemData_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -390,8 +359,6 @@ int32 OS_TaskValidateSystemData_Impl(const void *sysdata, size_t sysdata_size) } /*---------------------------------------------------------------- - * - * Function: OS_TaskIdMatchSystemData_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail diff --git a/src/os/rtems/src/os-impl-timebase.c b/src/os/rtems/src/os-impl-timebase.c index 0f6842937..531ccd87d 100644 --- a/src/os/rtems/src/os-impl-timebase.c +++ b/src/os/rtems/src/os-impl-timebase.c @@ -82,8 +82,6 @@ typedef struct OS_impl_timebase_internal_record_t OS_impl_timebase_table[OS_MAX_TIMEBASES]; /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseLock_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -96,11 +94,9 @@ void OS_TimeBaseLock_Impl(const OS_object_token_t *token) impl = OS_OBJECT_TABLE_GET(OS_impl_timebase_table, *token); rtems_semaphore_obtain(impl->handler_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT); -} /* end OS_TimeBaseLock_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseUnlock_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -113,11 +109,9 @@ void OS_TimeBaseUnlock_Impl(const OS_object_token_t *token) impl = OS_OBJECT_TABLE_GET(OS_impl_timebase_table, *token); rtems_semaphore_release(impl->handler_mutex); -} /* end OS_TimeBaseUnlock_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBase_ISR * * Purpose: Local helper routine, not part of OSAL API. * An ISR to service a timer tick interrupt, which in turn @@ -151,12 +145,9 @@ static rtems_timer_service_routine OS_TimeBase_ISR(rtems_id rtems_timer_id, void */ rtems_semaphore_release(local->tick_sem); } - -} /* end OS_TimeBase_ISR */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBase_WaitImpl * * Purpose: Local helper routine, not part of OSAL API. * Pends on the semaphore for the next timer tick @@ -198,15 +189,13 @@ static uint32 OS_TimeBase_WaitImpl(osal_id_t timebase_id) } return tick_time; -} /* end OS_TimeBase_WaitImpl */ +} /**************************************************************************************** INITIALIZATION FUNCTION ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_Rtems_TimeBaseAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -244,15 +233,13 @@ int32 OS_Rtems_TimeBaseAPI_Impl_Init(void) OS_SharedGlobalVars.MicroSecPerTick = (RTEMS_GlobalVars.ClockAccuracyNsec + 500) / 1000; return OS_SUCCESS; -} /* end OS_Rtems_TimeBaseAPI_Impl_Init */ +} /**************************************************************************************** INTERNAL FUNCTIONS ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_UsecsToTicks * * Purpose: Convert Microseconds to a number of ticks. * @@ -277,7 +264,7 @@ void OS_UsecsToTicks(uint32 usecs, rtems_interval *ticks) } *ticks = (rtems_interval)result; -} /* end OS_UsecsToTicks */ +} /**************************************************************************************** Time Base API @@ -287,8 +274,6 @@ void OS_UsecsToTicks(uint32 usecs, rtems_interval *ticks) #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 @@ -305,8 +290,6 @@ static void OS_TimeBase_CallbackThreadEntry(rtems_task_argument arg) } /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -431,11 +414,9 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_TimeBaseCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseSet_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -535,11 +516,9 @@ int32 OS_TimeBaseSet_Impl(const OS_object_token_t *token, uint32 start_time, uin local->reset_flag = 1; } return return_code; -} /* end OS_TimeBaseSet_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -599,11 +578,9 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_TimeBaseDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -612,5 +589,4 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token) int32 OS_TimeBaseGetInfo_Impl(const OS_object_token_t *token, OS_timebase_prop_t *timer_prop) { return OS_SUCCESS; - -} /* end OS_TimeBaseGetInfo_Impl */ +} diff --git a/src/os/shared/inc/os-shared-binsem.h b/src/os/shared/inc/os-shared-binsem.h index 0e52bf9f3..906b6ddd0 100644 --- a/src/os/shared/inc/os-shared-binsem.h +++ b/src/os/shared/inc/os-shared-binsem.h @@ -55,7 +55,6 @@ extern OS_bin_sem_internal_record_t OS_bin_sem_table[OS_MAX_BIN_SEMAPHORES]; int32 OS_BinSemAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_BinSemCreate_Impl Purpose: Prepare/allocate OS resources for a binary semaphore @@ -64,7 +63,6 @@ int32 OS_BinSemAPI_Init(void); int32 OS_BinSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_value, uint32 options); /*---------------------------------------------------------------- - Function: OS_BinSemFlush_Impl Purpose: Unblock all tasks waiting on the binary semaphore. Does not change the semaphore value. @@ -74,7 +72,6 @@ int32 OS_BinSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_va int32 OS_BinSemFlush_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_BinSemGive_Impl Purpose: Release the semaphore @@ -83,7 +80,6 @@ int32 OS_BinSemFlush_Impl(const OS_object_token_t *token); int32 OS_BinSemGive_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_BinSemTake_Impl Purpose: Acquire the semaphore Block the calling task if the semaphore is 0. @@ -93,7 +89,6 @@ int32 OS_BinSemGive_Impl(const OS_object_token_t *token); int32 OS_BinSemTake_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_BinSemTimedWait_Impl Purpose: Acquire the semaphore, with a time limit @@ -103,7 +98,6 @@ int32 OS_BinSemTake_Impl(const OS_object_token_t *token); int32 OS_BinSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs); /*---------------------------------------------------------------- - Function: OS_BinSemDelete_Impl Purpose: Free the OS resources associated with the binary semaphore @@ -112,7 +106,6 @@ int32 OS_BinSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs); int32 OS_BinSemDelete_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_BinSemGetInfo_Impl Purpose: Obtain OS-specific information about the semaphore diff --git a/src/os/shared/inc/os-shared-clock.h b/src/os/shared/inc/os-shared-clock.h index 0cfad5cba..d578c7474 100644 --- a/src/os/shared/inc/os-shared-clock.h +++ b/src/os/shared/inc/os-shared-clock.h @@ -35,7 +35,6 @@ */ /*---------------------------------------------------------------- - Function: OS_GetLocalTime_Impl Purpose: Get the time from the RTC @@ -44,7 +43,6 @@ int32 OS_GetLocalTime_Impl(OS_time_t *time_struct); /*---------------------------------------------------------------- - Function: OS_SetLocalTime_Impl Purpose: Set the time in the RTC diff --git a/src/os/shared/inc/os-shared-common.h b/src/os/shared/inc/os-shared-common.h index bf82f2dfe..e84249835 100644 --- a/src/os/shared/inc/os-shared-common.h +++ b/src/os/shared/inc/os-shared-common.h @@ -103,8 +103,6 @@ int32 OS_API_Impl_Init(osal_objtype_t idtype); /*---------------------------------------------------------------- - Function: OS_IdleLoop_Impl - Purpose: Block the "idle" thread until woken up The "IdleLoop_Impl" is called by the main thread once @@ -118,8 +116,6 @@ void OS_IdleLoop_Impl(void); /*---------------------------------------------------------------- - Function: OS_ApplicationShutdown_Impl - Purpose: Wake up the idle task The "ApplicationShutdown_Impl" should wake up whatever @@ -135,8 +131,6 @@ void OS_ApplicationShutdown_Impl(void); /*---------------------------------------------------------------- - Function: OS_strnlen - Purpose: Utility function to safely find the length of a string within a fixed-size array buffer. diff --git a/src/os/shared/inc/os-shared-condvar.h b/src/os/shared/inc/os-shared-condvar.h index 8faadbf4c..588d725a4 100644 --- a/src/os/shared/inc/os-shared-condvar.h +++ b/src/os/shared/inc/os-shared-condvar.h @@ -50,7 +50,6 @@ extern OS_condvar_internal_record_t OS_condvar_table[OS_MAX_CONDVARS]; int32 OS_CondVarAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_CondVarCreate_Impl Purpose: Prepare/allocate OS resources for a condvar object @@ -59,7 +58,6 @@ int32 OS_CondVarAPI_Init(void); int32 OS_CondVarCreate_Impl(const OS_object_token_t *token, uint32 options); /*---------------------------------------------------------------- - Function: OS_CondVarLock_Impl Purpose: Acquires the underlying mutex @@ -68,7 +66,6 @@ int32 OS_CondVarCreate_Impl(const OS_object_token_t *token, uint32 options); int32 OS_CondVarLock_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CondVarUnlock_Impl Purpose: Release the underlying mutex @@ -77,7 +74,6 @@ int32 OS_CondVarLock_Impl(const OS_object_token_t *token); int32 OS_CondVarUnlock_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CondVarSignal_Impl Purpose: Wake up one blocked task @@ -86,7 +82,6 @@ int32 OS_CondVarUnlock_Impl(const OS_object_token_t *token); int32 OS_CondVarSignal_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CondVarBroadcast_Impl Purpose: Wake up all blocked tasks @@ -95,7 +90,6 @@ int32 OS_CondVarSignal_Impl(const OS_object_token_t *token); int32 OS_CondVarBroadcast_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CondVarWait_Impl Purpose: Wait indefinitely for the condvar to be signaled @@ -104,7 +98,6 @@ int32 OS_CondVarBroadcast_Impl(const OS_object_token_t *token); int32 OS_CondVarWait_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CondVarTimedWait_Impl Purpose: Time-Limited wait for the condvar to be signaled @@ -113,7 +106,6 @@ int32 OS_CondVarWait_Impl(const OS_object_token_t *token); int32 OS_CondVarTimedWait_Impl(const OS_object_token_t *token, const OS_time_t *abs_wakeup_time); /*---------------------------------------------------------------- - Function: OS_CondVarDelete_Impl Purpose: Free the OS resources associated with a condvar object @@ -122,7 +114,6 @@ int32 OS_CondVarTimedWait_Impl(const OS_object_token_t *token, const OS_time_t * int32 OS_CondVarDelete_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CondVarGetInfo_Impl Purpose: Obtain OS-specific information about the condvar object diff --git a/src/os/shared/inc/os-shared-console.h b/src/os/shared/inc/os-shared-console.h index e370906ed..42ade40f3 100644 --- a/src/os/shared/inc/os-shared-console.h +++ b/src/os/shared/inc/os-shared-console.h @@ -51,7 +51,6 @@ typedef struct volatile size_t WritePos; /**< Offset of next byte to write */ uint32 OverflowEvents; /**< Number of lines dropped due to overflow */ bool IsAsync; /**< Whether to write data via deferred utility task */ - } OS_console_internal_record_t; extern OS_console_internal_record_t OS_console_table[OS_MAX_CONSOLES]; @@ -70,7 +69,6 @@ extern OS_console_internal_record_t OS_console_table[OS_MAX_CONSOLES]; int32 OS_ConsoleAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_ConsoleCreate_Impl Purpose: Prepare a console device for use For Async devices, this sets up the background writer task @@ -78,7 +76,6 @@ int32 OS_ConsoleAPI_Init(void); int32 OS_ConsoleCreate_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ConsoleWakeup_Impl Purpose: Console output data notification diff --git a/src/os/shared/inc/os-shared-countsem.h b/src/os/shared/inc/os-shared-countsem.h index 59012db9e..3d8827a6f 100644 --- a/src/os/shared/inc/os-shared-countsem.h +++ b/src/os/shared/inc/os-shared-countsem.h @@ -55,7 +55,6 @@ extern OS_count_sem_internal_record_t OS_count_sem_table[OS_MAX_COUNT_SEMAPHORES int32 OS_CountSemAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_CountSemCreate_Impl Purpose: Prepare/allocate OS resources for a counting semaphore @@ -64,7 +63,6 @@ int32 OS_CountSemAPI_Init(void); int32 OS_CountSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_value, uint32 options); /*---------------------------------------------------------------- - Function: OS_CountSemGive_Impl Purpose: Increment the semaphore value @@ -73,7 +71,6 @@ int32 OS_CountSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_ int32 OS_CountSemGive_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CountSemTake_Impl Purpose: Decrement the semaphore value Block the calling task if the semaphore is 0. @@ -83,7 +80,6 @@ int32 OS_CountSemGive_Impl(const OS_object_token_t *token); int32 OS_CountSemTake_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CountSemTimedWait_Impl Purpose: Decrement the semaphore value, with a time limit @@ -93,7 +89,6 @@ int32 OS_CountSemTake_Impl(const OS_object_token_t *token); int32 OS_CountSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs); /*---------------------------------------------------------------- - Function: OS_CountSemDelete_Impl Purpose: Free the OS resources associated with the counting semaphore @@ -102,7 +97,6 @@ int32 OS_CountSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs); int32 OS_CountSemDelete_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_CountSemGetInfo_Impl Purpose: Obtain OS-specific information about the semaphore diff --git a/src/os/shared/inc/os-shared-dir.h b/src/os/shared/inc/os-shared-dir.h index 043726c3f..5095efd63 100644 --- a/src/os/shared/inc/os-shared-dir.h +++ b/src/os/shared/inc/os-shared-dir.h @@ -56,7 +56,6 @@ extern OS_dir_internal_record_t OS_dir_table[OS_MAX_NUM_OPEN_DIRS]; int32 OS_DirAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_DirCreate_Impl Purpose: Create a directory in the local filesystem @@ -65,7 +64,6 @@ int32 OS_DirAPI_Init(void); int32 OS_DirCreate_Impl(const char *local_path, uint32 access); /*---------------------------------------------------------------- - Function: OS_DirOpen_Impl Purpose: Open a directory and prepare to read the entries @@ -74,7 +72,6 @@ int32 OS_DirCreate_Impl(const char *local_path, uint32 access); int32 OS_DirOpen_Impl(const OS_object_token_t *token, const char *local_path); /*---------------------------------------------------------------- - Function: OS_DirClose_Impl Purpose: Close a directory @@ -83,7 +80,6 @@ int32 OS_DirOpen_Impl(const OS_object_token_t *token, const char *local_path); int32 OS_DirClose_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_DirRead_Impl Purpose: Read the next entry from a directory handle @@ -92,7 +88,6 @@ int32 OS_DirClose_Impl(const OS_object_token_t *token); int32 OS_DirRead_Impl(const OS_object_token_t *token, os_dirent_t *dirent); /*---------------------------------------------------------------- - Function: OS_DirRewind_Impl Purpose: Rewind a directory handle back to the start @@ -101,7 +96,6 @@ int32 OS_DirRead_Impl(const OS_object_token_t *token, os_dirent_t *dirent); int32 OS_DirRewind_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_DirRemove_Impl Purpose: Remove a directory in the local filesystem diff --git a/src/os/shared/inc/os-shared-file.h b/src/os/shared/inc/os-shared-file.h index a0c0cc686..8c21f3bb4 100644 --- a/src/os/shared/inc/os-shared-file.h +++ b/src/os/shared/inc/os-shared-file.h @@ -71,7 +71,6 @@ int32 OS_FileAPI_Init(void); */ /*---------------------------------------------------------------- - Function: OS_GenericSeek_Impl Purpose: Seek to a given position in a file @@ -80,7 +79,6 @@ int32 OS_FileAPI_Init(void); int32 OS_GenericSeek_Impl(const OS_object_token_t *token, int32 offset, uint32 whence); /*---------------------------------------------------------------- - Function: OS_GenericRead_Impl Purpose: Read from a file descriptor This may be a normal file or a socket/pipe @@ -90,7 +88,6 @@ int32 OS_GenericSeek_Impl(const OS_object_token_t *token, int32 offset, uint32 w int32 OS_GenericRead_Impl(const OS_object_token_t *token, void *buffer, size_t nbytes, int32 timeout); /*---------------------------------------------------------------- - Function: OS_GenericWrite_Impl Purpose: Write to a file descriptor This may be a normal file or a socket/pipe @@ -100,7 +97,6 @@ int32 OS_GenericRead_Impl(const OS_object_token_t *token, void *buffer, size_t n int32 OS_GenericWrite_Impl(const OS_object_token_t *token, const void *buffer, size_t nbytes, int32 timeout); /*---------------------------------------------------------------- - Function: OS_GenericClose_Impl Purpose: Close a file descriptor This may be a normal file or a socket/pipe @@ -110,7 +106,6 @@ int32 OS_GenericWrite_Impl(const OS_object_token_t *token, const void *buffer, s int32 OS_GenericClose_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_FileOpen_Impl Purpose: Opens the file indicated by "local_path" with permission indicated by "access_mode". @@ -120,7 +115,6 @@ int32 OS_GenericClose_Impl(const OS_object_token_t *token); int32 OS_FileOpen_Impl(const OS_object_token_t *token, const char *local_path, int32 flags, int32 access_mode); /*---------------------------------------------------------------- - Function: OS_ShellOutputToFile_Impl Purpose: Takes a shell command in and writes the output of that command to the specified file @@ -145,7 +139,6 @@ int32 OS_ShellOutputToFile_Impl(const OS_object_token_t *token, const char *Cmd) */ /*---------------------------------------------------------------- - Function: OS_FileStat_Impl Purpose: Output stats on the file indicated by "local_path" @@ -154,7 +147,6 @@ int32 OS_ShellOutputToFile_Impl(const OS_object_token_t *token, const char *Cmd) int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *filestat); /*---------------------------------------------------------------- - Function: OS_FileRemove_Impl Purpose: Remove/Unlink the file indicated by "local_path" @@ -163,7 +155,6 @@ int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *filestat); int32 OS_FileRemove_Impl(const char *local_path); /*---------------------------------------------------------------- - Function: OS_FileRename_Impl Purpose: Rename "old_path" to "new_path" in the filesystem @@ -173,8 +164,6 @@ int32 OS_FileRename_Impl(const char *old_path, const char *new_path); /*---------------------------------------------------------------- - Function: OS_FileChmod_Impl - Purpose: Change permission on an existing file Returns: OS_SUCCESS on success, or relevant error code diff --git a/src/os/shared/inc/os-shared-filesys.h b/src/os/shared/inc/os-shared-filesys.h index da19947f4..a322a74ed 100644 --- a/src/os/shared/inc/os-shared-filesys.h +++ b/src/os/shared/inc/os-shared-filesys.h @@ -117,7 +117,6 @@ extern OS_filesys_internal_record_t OS_filesys_table[OS_MAX_FILE_SYSTEMS]; int32 OS_FileSysAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_FileSysStartVolume_Impl Purpose: Starts/Registers a file system on the target @@ -126,7 +125,6 @@ int32 OS_FileSysAPI_Init(void); int32 OS_FileSysStartVolume_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_FileSysStopVolume_Impl Purpose: Stops/Unregisters a file system on the target @@ -135,7 +133,6 @@ int32 OS_FileSysStartVolume_Impl(const OS_object_token_t *token); int32 OS_FileSysStopVolume_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_FileSysFormatVolume_Impl Purpose: Formats a file system on the target to prepare it for use @@ -144,7 +141,6 @@ int32 OS_FileSysStopVolume_Impl(const OS_object_token_t *token); int32 OS_FileSysFormatVolume_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_FileSysCheckVolume_Impl Purpose: Checks the drives and optionally repairs inconsistencies @@ -153,7 +149,6 @@ int32 OS_FileSysFormatVolume_Impl(const OS_object_token_t *token); int32 OS_FileSysCheckVolume_Impl(const OS_object_token_t *token, bool repair); /*---------------------------------------------------------------- - Function: OS_FileSysStatVolume_Impl Purpose: Returns stats about a volume @@ -162,7 +157,6 @@ int32 OS_FileSysCheckVolume_Impl(const OS_object_token_t *token, bool repair); int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *result); /*---------------------------------------------------------------- - Function: OS_FileSysMountVolume_Impl Purpose: mounts a drive @@ -171,7 +165,6 @@ int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *re int32 OS_FileSysMountVolume_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_FileSysUnmountVolume_Impl Purpose: unmounts a drive. diff --git a/src/os/shared/inc/os-shared-heap.h b/src/os/shared/inc/os-shared-heap.h index dd528dddb..a8fa67aa7 100644 --- a/src/os/shared/inc/os-shared-heap.h +++ b/src/os/shared/inc/os-shared-heap.h @@ -38,7 +38,6 @@ */ /*---------------------------------------------------------------- - Function: OS_HeapGetInfo_Impl Purpose: Return current info on the heap diff --git a/src/os/shared/inc/os-shared-idmap.h b/src/os/shared/inc/os-shared-idmap.h index 6a0b86bef..c1dacc285 100644 --- a/src/os/shared/inc/os-shared-idmap.h +++ b/src/os/shared/inc/os-shared-idmap.h @@ -175,7 +175,6 @@ int32 OS_ObjectIdInit(void); */ /*---------------------------------------------------------------- - Function: OS_Lock_Global Purpose: Locks the global table identified by "idtype" @@ -184,7 +183,6 @@ int32 OS_ObjectIdInit(void); void OS_Lock_Global(OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_Lock_Global Purpose: Locks the global table identified by "idtype" @@ -193,7 +191,6 @@ void OS_Lock_Global(OS_object_token_t *token); void OS_Lock_Global_Impl(osal_objtype_t idtype); /*---------------------------------------------------------------- - Function: OS_Unlock_Global Purpose: Unlocks the global table identified by "idtype" @@ -202,7 +199,6 @@ void OS_Lock_Global_Impl(osal_objtype_t idtype); void OS_Unlock_Global(OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_Unlock_Global Purpose: Unlocks the global table identified by "idtype" @@ -212,8 +208,6 @@ void OS_Unlock_Global_Impl(osal_objtype_t idtype); /*---------------------------------------------------------------- - Function: OS_WaitForStateChange - Purpose: Waits for a change in the global table identified by "idtype" NOTE: The table must be already "owned" (via OS_Lock_Global) by the calling @@ -225,8 +219,6 @@ void OS_WaitForStateChange(OS_object_token_t *token, uint32 attempts); /*---------------------------------------------------------------- - Function: OS_WaitForStateChange_Impl - Purpose: Block the caller until some sort of change event has occurred for the given object type, such as a record changing state i.e. the acquisition or release of a lock/refcount from @@ -248,7 +240,6 @@ void OS_WaitForStateChange_Impl(osal_objtype_t objtype, uint32 attempts); */ /*---------------------------------------------------------------- - Function: OS_ObjectIdToSerialNumber Purpose: Obtain the serial number component of a generic OSAL Object ID ------------------------------------------------------------------*/ @@ -258,7 +249,6 @@ static inline uint32 OS_ObjectIdToSerialNumber_Impl(osal_id_t id) } /*---------------------------------------------------------------- - Function: OS_ObjectIdToType Purpose: Obtain the object type component of a generic OSAL Object ID ------------------------------------------------------------------*/ @@ -268,7 +258,6 @@ static inline osal_objtype_t OS_ObjectIdToType_Impl(osal_id_t id) } /*---------------------------------------------------------------- - Function: OS_ObjectIdCompose Purpose: Convert an object serial number and resource type into an external 32-bit OSAL ID ------------------------------------------------------------------*/ @@ -298,7 +287,6 @@ static inline bool OS_ObjectIdIsValid(osal_id_t object_id) } /*---------------------------------------------------------------- - Function: OS_GetMaxForObjectType Purpose: Obtains the maximum number of objects for "idtype" in the global table @@ -307,7 +295,6 @@ static inline bool OS_ObjectIdIsValid(osal_id_t object_id) uint32 OS_GetMaxForObjectType(osal_objtype_t idtype); /*---------------------------------------------------------------- - Function: OS_GetBaseForObjectType Purpose: Obtains the base object number for "idtype" in the global table @@ -316,7 +303,6 @@ uint32 OS_GetMaxForObjectType(osal_objtype_t idtype); uint32 OS_GetBaseForObjectType(osal_objtype_t idtype); /*---------------------------------------------------------------- - Function: OS_ObjectIndexFromToken Purpose: Gets the index referenced by the token @@ -328,7 +314,6 @@ static inline osal_objtype_t OS_ObjectTypeFromToken(const OS_object_token_t *tok } /*---------------------------------------------------------------- - Function: OS_ObjectIndexFromToken Purpose: Gets the index referenced by the token @@ -340,7 +325,6 @@ static inline osal_index_t OS_ObjectIndexFromToken(const OS_object_token_t *toke } /*---------------------------------------------------------------- - Function: OS_ObjectIdFromToken Purpose: Gets the object ID referenced by the token @@ -352,7 +336,6 @@ static inline osal_id_t OS_ObjectIdFromToken(const OS_object_token_t *token) } /*---------------------------------------------------------------- - Function: OS_ObjectIdGlobalFromToken Purpose: Obtains the global record corresponding to the token @@ -361,7 +344,6 @@ static inline osal_id_t OS_ObjectIdFromToken(const OS_object_token_t *token) OS_common_record_t *OS_ObjectIdGlobalFromToken(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdTransactionInit Purpose: Initiates a transaction by obtaining the global table lock and preparing the object token value @@ -371,7 +353,6 @@ OS_common_record_t *OS_ObjectIdGlobalFromToken(const OS_object_token_t *token); int32 OS_ObjectIdTransactionInit(OS_lock_mode_t lock_mode, osal_objtype_t idtype, OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdTransactionCancel Purpose: Cancels/Releases the lock obtained by OS_ObjectIdTransactionInit() without making any modification to global IDs. @@ -381,7 +362,6 @@ int32 OS_ObjectIdTransactionInit(OS_lock_mode_t lock_mode, osal_objtype_t idtype void OS_ObjectIdTransactionCancel(OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdTransactionFinish Purpose: Releases the lock obtained by OS_ObjectIdTransactionInit() with an optional synchronized ID update for new/deleted IDs. @@ -391,7 +371,6 @@ void OS_ObjectIdTransactionCancel(OS_object_token_t *token); void OS_ObjectIdTransactionFinish(OS_object_token_t *token, const osal_id_t *final_id); /*---------------------------------------------------------------- - Function: OS_ObjectIdConvertToken Purpose: Converts a token from OS_ObjectIdTransactionInit() to the type that was requested by the user. @@ -401,7 +380,6 @@ void OS_ObjectIdTransactionFinish(OS_object_token_t *token, const osal_id_t *fin int32 OS_ObjectIdConvertToken(OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdFindByName Purpose: Finds an entry in the global resource table matching the given name @@ -410,7 +388,6 @@ int32 OS_ObjectIdConvertToken(OS_object_token_t *token); int32 OS_ObjectIdFindByName(osal_objtype_t idtype, const char *name, osal_id_t *object_id); /*---------------------------------------------------------------- - Function: OS_ObjectIdGetBySearch Purpose: Find and lock an entry in the global resource table Search is performed using a user-specified match function @@ -422,7 +399,6 @@ int32 OS_ObjectIdGetBySearch(OS_lock_mode_t lock_mode, osal_objtype_t idtype, OS OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdGetByName Purpose: Find and lock an entry in the global resource table Search is performed using a name match function @@ -432,7 +408,6 @@ int32 OS_ObjectIdGetBySearch(OS_lock_mode_t lock_mode, osal_objtype_t idtype, OS int32 OS_ObjectIdGetByName(OS_lock_mode_t lock_mode, osal_objtype_t idtype, const char *name, OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdGetById Purpose: Find and lock an entry in the global resource table Lookup is performed by ID value (no searching required) @@ -442,7 +417,6 @@ int32 OS_ObjectIdGetByName(OS_lock_mode_t lock_mode, osal_objtype_t idtype, cons int32 OS_ObjectIdGetById(OS_lock_mode_t lock_mode, osal_objtype_t idtype, osal_id_t id, OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdRelease Purpose: Releases (unlocks) the object token previously obtained using OS_ObjectIdGetById() or OS_ObjectIdGetBySearch(). @@ -452,7 +426,6 @@ int32 OS_ObjectIdGetById(OS_lock_mode_t lock_mode, osal_objtype_t idtype, osal_i void OS_ObjectIdRelease(OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdTransferToken Purpose: Transfers ownership of an object token without unlocking/releasing. The original token will become benign and the new token becomes active. @@ -462,7 +435,6 @@ void OS_ObjectIdRelease(OS_object_token_t *token); void OS_ObjectIdTransferToken(OS_object_token_t *token_from, OS_object_token_t *token_to); /*---------------------------------------------------------------- - Function: OS_ObjectIdAllocateNew Purpose: Issue a new object ID of the given type and associate with the given name The array index (0-based) and global record pointers are output back to the caller @@ -474,7 +446,6 @@ void OS_ObjectIdTransferToken(OS_object_token_t *token_from, OS_object_token_t * int32 OS_ObjectIdAllocateNew(osal_objtype_t idtype, const char *name, OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdFinalizeNew Purpose: Completes the operation initiated by OS_ObjectIdAllocateNew() If the operation was successful, the final OSAL ID is returned @@ -486,7 +457,6 @@ int32 OS_ObjectIdAllocateNew(osal_objtype_t idtype, const char *name, OS_object_ int32 OS_ObjectIdFinalizeNew(int32 operation_status, OS_object_token_t *token, osal_id_t *outid); /*---------------------------------------------------------------- - Function: OS_ObjectIdFinalizeDelete Purpose: Completes a delete operation If the operation was successful, the OSAL ID is deleted and returned to the pool @@ -498,7 +468,6 @@ int32 OS_ObjectIdFinalizeNew(int32 operation_status, OS_object_token_t *token, o int32 OS_ObjectIdFinalizeDelete(int32 operation_status, OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorInit Purpose: Initialize a generic object iterator of the given type. Note This obtains and holds a global lock on the internal table, so @@ -510,7 +479,6 @@ int32 OS_ObjectIdIteratorInit(OS_ObjectMatchFunc_t matchfunc, void *matcharg, os OS_object_iter_t *iter); /*---------------------------------------------------------------- - Function: OS_ObjectIdIterateActive Purpose: Initialize an object iterator of the given type that will return only active/valid OSAL objects. @@ -520,7 +488,6 @@ int32 OS_ObjectIdIteratorInit(OS_ObjectMatchFunc_t matchfunc, void *matcharg, os int32 OS_ObjectIdIterateActive(osal_objtype_t objtype, OS_object_iter_t *iter); /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorGetNext Purpose: Move then token to the next matching iterator entry @@ -529,7 +496,6 @@ int32 OS_ObjectIdIterateActive(osal_objtype_t objtype, OS_object_iter_t *iter); bool OS_ObjectIdIteratorGetNext(OS_object_iter_t *iter); /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorDestroy Purpose: Releases an iterator from OS_ObjectIdIteratorInit() @@ -538,7 +504,6 @@ bool OS_ObjectIdIteratorGetNext(OS_object_iter_t *iter); void OS_ObjectIdIteratorDestroy(OS_object_iter_t *iter); /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorRef Purpose: Gets the token indicating current iterator position The returned token can be used to access the relevant entry @@ -551,7 +516,6 @@ static inline const OS_object_token_t *OS_ObjectIdIteratorRef(OS_object_iter_t * } /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorProcessEntry Purpose: Calls a function using the ID of the entry from the iterator diff --git a/src/os/shared/inc/os-shared-module.h b/src/os/shared/inc/os-shared-module.h index ed55aee3d..8e999f279 100644 --- a/src/os/shared/inc/os-shared-module.h +++ b/src/os/shared/inc/os-shared-module.h @@ -65,7 +65,6 @@ extern OS_module_internal_record_t OS_module_table[OS_MAX_MODULES]; int32 OS_ModuleAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_ModuleLoad_Impl Purpose: Loads an object file into the running operating system @@ -75,8 +74,6 @@ int32 OS_ModuleLoad_Impl(const OS_object_token_t *token, const char *translated_ /*---------------------------------------------------------------- - Function: OS_ModuleUnload_Impl - Purpose: Unloads the module file from the running operating system Returns: OS_SUCCESS on success, or relevant error code @@ -84,7 +81,6 @@ int32 OS_ModuleLoad_Impl(const OS_object_token_t *token, const char *translated_ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_ModuleGetInfo_Impl Purpose: Returns information about the loadable module @@ -93,7 +89,6 @@ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token); int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *module_prop); /*---------------------------------------------------------------- - Function: OS_SymbolLookup_Impl Purpose: Find the Address of a Symbol in the symbol table. If global and local tables exist all are checked. @@ -104,7 +99,6 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo int32 OS_SymbolLookup_Impl(cpuaddr *SymbolAddress, const char *SymbolName); /*---------------------------------------------------------------- - Function: OS_SymbolLookup_Impl Purpose: Find the Address of a Symbol within a specific module. The address of the symbol will be stored in the pointer that is passed in. @@ -114,7 +108,6 @@ int32 OS_SymbolLookup_Impl(cpuaddr *SymbolAddress, const char *SymbolName); int32 OS_ModuleSymbolLookup_Impl(const OS_object_token_t *token, cpuaddr *SymbolAddress, const char *SymbolName); /*---------------------------------------------------------------- - Function: OS_SymbolTableDump_Impl Purpose: Dumps the system symbol table to a file diff --git a/src/os/shared/inc/os-shared-mutex.h b/src/os/shared/inc/os-shared-mutex.h index f0859f594..cf4a1bf7f 100644 --- a/src/os/shared/inc/os-shared-mutex.h +++ b/src/os/shared/inc/os-shared-mutex.h @@ -51,7 +51,6 @@ extern OS_mutex_internal_record_t OS_mutex_table[OS_MAX_MUTEXES]; int32 OS_MutexAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_MutSemCreate_Impl Purpose: Prepare/allocate OS resources for a mutex object @@ -60,7 +59,6 @@ int32 OS_MutexAPI_Init(void); int32 OS_MutSemCreate_Impl(const OS_object_token_t *token, uint32 options); /*---------------------------------------------------------------- - Function: OS_MutSemGive_Impl Purpose: Release the mutex, which must be owned by the caller @@ -69,7 +67,6 @@ int32 OS_MutSemCreate_Impl(const OS_object_token_t *token, uint32 options); int32 OS_MutSemGive_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_MutSemTake_Impl Purpose: Acquire the mutex, blocking the caller as necessary @@ -78,7 +75,6 @@ int32 OS_MutSemGive_Impl(const OS_object_token_t *token); int32 OS_MutSemTake_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_MutSemDelete_Impl Purpose: Free the OS resources associated with a mutex object @@ -87,7 +83,6 @@ int32 OS_MutSemTake_Impl(const OS_object_token_t *token); int32 OS_MutSemDelete_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_MutSemGetInfo_Impl Purpose: Obtain OS-specific information about the mutex object diff --git a/src/os/shared/inc/os-shared-network.h b/src/os/shared/inc/os-shared-network.h index 49616a3cc..586a0bc02 100644 --- a/src/os/shared/inc/os-shared-network.h +++ b/src/os/shared/inc/os-shared-network.h @@ -44,8 +44,6 @@ int32 OS_NetworkAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_NetworkGetHostName_Impl - Purpose: Gets the name of the current host Returns: OS_SUCCESS on success, or relevant error code @@ -53,7 +51,6 @@ int32 OS_NetworkAPI_Init(void); int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len); /*---------------------------------------------------------------- - Function: OS_NetworkGetID_Impl Purpose: Gets the ID of the host on the network diff --git a/src/os/shared/inc/os-shared-printf.h b/src/os/shared/inc/os-shared-printf.h index b89606b7d..46465003e 100644 --- a/src/os/shared/inc/os-shared-printf.h +++ b/src/os/shared/inc/os-shared-printf.h @@ -35,7 +35,6 @@ ****************************************************************************************/ /*---------------------------------------------------------------- - Function: OS_ConsoleOutput_Impl Purpose: Basic Console output implementation diff --git a/src/os/shared/inc/os-shared-queue.h b/src/os/shared/inc/os-shared-queue.h index 7e1984b5a..2f43c1d10 100644 --- a/src/os/shared/inc/os-shared-queue.h +++ b/src/os/shared/inc/os-shared-queue.h @@ -56,7 +56,6 @@ extern OS_queue_internal_record_t OS_queue_table[OS_MAX_QUEUES]; int32 OS_QueueAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_QueueCreate_Impl Purpose: Prepare/Allocate OS resources for a message queue @@ -65,7 +64,6 @@ int32 OS_QueueAPI_Init(void); int32 OS_QueueCreate_Impl(const OS_object_token_t *token, uint32 flags); /*---------------------------------------------------------------- - Function: OS_QueueDelete_Impl Purpose: Free the OS resources associated with the message queue @@ -74,7 +72,6 @@ int32 OS_QueueCreate_Impl(const OS_object_token_t *token, uint32 flags); int32 OS_QueueDelete_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_QueueGet_Impl Purpose: Receive a message on a message queue. The calling task will be blocked if no message is immediately available @@ -87,7 +84,6 @@ int32 OS_QueueDelete_Impl(const OS_object_token_t *token); int32 OS_QueueGet_Impl(const OS_object_token_t *token, void *data, size_t size, size_t *size_copied, int32 timeout); /*---------------------------------------------------------------- - Function: OS_QueuePut_Impl Purpose: Put a message into a message queue @@ -97,7 +93,6 @@ int32 OS_QueueGet_Impl(const OS_object_token_t *token, void *data, size_t size, int32 OS_QueuePut_Impl(const OS_object_token_t *token, const void *data, size_t size, uint32 flags); /*---------------------------------------------------------------- - Function: OS_QueueGetInfo_Impl Purpose: Obtain OS-specific information about a message queue diff --git a/src/os/shared/inc/os-shared-select.h b/src/os/shared/inc/os-shared-select.h index 54486600c..a2123762e 100644 --- a/src/os/shared/inc/os-shared-select.h +++ b/src/os/shared/inc/os-shared-select.h @@ -36,7 +36,6 @@ */ /*---------------------------------------------------------------- - Function: OS_SelectSingle_Impl Purpose: Waits for activity on a single file descriptor This wrapper is usable by the File or Socket API @@ -53,8 +52,6 @@ int32 OS_SelectSingle_Impl(const OS_object_token_t *token, uint32 *SelectFlags, /*---------------------------------------------------------------- - Function: OS_SelectMultiple_Impl - Purpose: Waits for activity on multiple file descriptors This wrapper is usable by the File or Socket API Will wait for any file descriptor in "ReadSet" to be readable OR diff --git a/src/os/shared/inc/os-shared-shell.h b/src/os/shared/inc/os-shared-shell.h index d6a485e25..35a00b4f1 100644 --- a/src/os/shared/inc/os-shared-shell.h +++ b/src/os/shared/inc/os-shared-shell.h @@ -34,7 +34,6 @@ ****************************************************************************************/ /*---------------------------------------------------------------- - Function: OS_ShellOutputToFile_Impl Purpose: Takes a shell command in and writes the output of that command to the specified file diff --git a/src/os/shared/inc/os-shared-sockets.h b/src/os/shared/inc/os-shared-sockets.h index ca1224753..4d5f2b950 100644 --- a/src/os/shared/inc/os-shared-sockets.h +++ b/src/os/shared/inc/os-shared-sockets.h @@ -43,7 +43,6 @@ int32 OS_SocketAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_SocketOpen_Impl Purpose: Opens the OS socket indicated by the sock_id table entry @@ -52,7 +51,6 @@ int32 OS_SocketAPI_Init(void); int32 OS_SocketOpen_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_SocketBind_Impl Purpose: Binds the indicated socket table entry to the passed-in address @@ -61,7 +59,6 @@ int32 OS_SocketOpen_Impl(const OS_object_token_t *token); int32 OS_SocketBind_Impl(const OS_object_token_t *token, const OS_SockAddr_t *Addr); /*---------------------------------------------------------------- - Function: OS_SocketAccept_Impl Purpose: Accept an incoming connection on the indicated socket (must be a STREAM socket) Will wait up to "timeout" milliseconds for an incoming connection @@ -73,7 +70,6 @@ int32 OS_SocketAccept_Impl(const OS_object_token_t *sock_token, const OS_object_ OS_SockAddr_t *Addr, int32 timeout); /*---------------------------------------------------------------- - Function: OS_SocketConnect_Impl Purpose: Connects the socket to a remote address. Socket must be of the STREAM variety. @@ -83,7 +79,6 @@ int32 OS_SocketAccept_Impl(const OS_object_token_t *sock_token, const OS_object_ int32 OS_SocketConnect_Impl(const OS_object_token_t *token, const OS_SockAddr_t *Addr, int32 timeout); /*---------------------------------------------------------------- - Function: OS_SocketShutdown_Impl Purpose: Graceful shutdown of a stream socket @@ -92,7 +87,6 @@ int32 OS_SocketConnect_Impl(const OS_object_token_t *token, const OS_SockAddr_t int32 OS_SocketShutdown_Impl(const OS_object_token_t *token, OS_SocketShutdownMode_t Mode); /*---------------------------------------------------------------- - Function: OS_SocketRecvFrom_Impl Purpose: Receives a datagram from the specified socket (must be of the DATAGRAM type) Stores the datagram in "buffer" which has a maximum size of "buflen" @@ -106,7 +100,6 @@ int32 OS_SocketRecvFrom_Impl(const OS_object_token_t *token, void *buffer, size_ int32 timeout); /*---------------------------------------------------------------- - Function: OS_SocketSendTo_Impl Purpose: Sends a datagram from the specified socket (must be of the DATAGRAM type) to the remote address specified by "RemoteAddr" @@ -119,8 +112,6 @@ int32 OS_SocketSendTo_Impl(const OS_object_token_t *token, const void *buffer, s /*---------------------------------------------------------------- - Function: OS_SocketGetInfo_Impl - Purpose: Get OS-specific information about a socket Returns: OS_SUCCESS on success, or relevant error code @@ -129,8 +120,6 @@ int32 OS_SocketGetInfo_Impl(const OS_object_token_t *token, OS_socket_prop_t *so /*---------------------------------------------------------------- - Function: OS_SocketAddrInit_Impl - Purpose: Initializes an OSAL SockAddr structure to the given address domain Returns: OS_SUCCESS on success, or relevant error code @@ -138,7 +127,6 @@ int32 OS_SocketGetInfo_Impl(const OS_object_token_t *token, OS_socket_prop_t *so int32 OS_SocketAddrInit_Impl(OS_SockAddr_t *Addr, OS_SocketDomain_t Domain); /*---------------------------------------------------------------- - Function: OS_SocketAddrToString_Impl Purpose: Converts a Socket Address structure to a printable string Useful for including a dotted-decimal IP address in a message or log @@ -148,7 +136,6 @@ int32 OS_SocketAddrInit_Impl(OS_SockAddr_t *Addr, OS_SocketDomain_t Domain); int32 OS_SocketAddrToString_Impl(char *buffer, size_t buflen, const OS_SockAddr_t *Addr); /*---------------------------------------------------------------- - Function: OS_SocketAddrFromString_Impl Purpose: Sets the Address portion of the SockAddr structure according to the string For IPV4 (SocketDomain_INET) this will parse the dotted decimal IP address. @@ -158,7 +145,6 @@ int32 OS_SocketAddrToString_Impl(char *buffer, size_t buflen, const OS_SockAddr_ int32 OS_SocketAddrFromString_Impl(OS_SockAddr_t *Addr, const char *string); /*---------------------------------------------------------------- - Function: OS_SocketAddrGetPort_Impl Purpose: Retrieve the TCP/UDP port number from the SockAddr structure @@ -170,7 +156,6 @@ int32 OS_SocketAddrFromString_Impl(OS_SockAddr_t *Addr, const char *string); int32 OS_SocketAddrGetPort_Impl(uint16 *PortNum, const OS_SockAddr_t *Addr); /*---------------------------------------------------------------- - Function: OS_SocketAddrSetPort_Impl Purpose: Set the TCP/UDP port number in the SockAddr structure diff --git a/src/os/shared/inc/os-shared-task.h b/src/os/shared/inc/os-shared-task.h index 2046df3c9..9bb04805c 100644 --- a/src/os/shared/inc/os-shared-task.h +++ b/src/os/shared/inc/os-shared-task.h @@ -61,7 +61,6 @@ extern OS_task_internal_record_t OS_task_table[OS_MAX_TASKS]; int32 OS_TaskAPI_Init(void); /*---------------------------------------------------------------- - Function: OS_TaskEntryPoint Purpose: Entry point for all newly created tasks @@ -74,7 +73,6 @@ int32 OS_TaskAPI_Init(void); void OS_TaskEntryPoint(osal_id_t global_task_id); /*---------------------------------------------------------------- - Function: OS_TaskMatch_Impl Purpose: Determines if the caller matches the given task_id @@ -84,8 +82,6 @@ int32 OS_TaskMatch_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_TaskCreate_Impl - Purpose: Prepare/Allocate OS resources for a new task and start running it, based on configuration in the global object @@ -94,7 +90,6 @@ int32 OS_TaskMatch_Impl(const OS_object_token_t *token); int32 OS_TaskCreate_Impl(const OS_object_token_t *token, uint32 flags); /*---------------------------------------------------------------- - Function: OS_TaskDetach_Impl Purpose: Sets the thread so that the OS resources associated with the task will be released when the thread exits itself @@ -104,7 +99,6 @@ int32 OS_TaskCreate_Impl(const OS_object_token_t *token, uint32 flags); int32 OS_TaskDetach_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_TaskDelete_Impl Purpose: Free the OS resources associated with the specified task @@ -113,7 +107,6 @@ int32 OS_TaskDetach_Impl(const OS_object_token_t *token); int32 OS_TaskDelete_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_TaskExit_Impl Purpose: Exits the calling task @@ -122,7 +115,6 @@ int32 OS_TaskDelete_Impl(const OS_object_token_t *token); void OS_TaskExit_Impl(void); /*---------------------------------------------------------------- - Function: OS_TaskDelay_Impl Purpose: Blocks the calling task for the specified number of milliseconds @@ -131,7 +123,6 @@ void OS_TaskExit_Impl(void); int32 OS_TaskDelay_Impl(uint32 millisecond); /*---------------------------------------------------------------- - Function: OS_TaskSetPriority_Impl Purpose: Set the scheduling priority of the specified task @@ -140,7 +131,6 @@ int32 OS_TaskDelay_Impl(uint32 millisecond); int32 OS_TaskSetPriority_Impl(const OS_object_token_t *token, osal_priority_t new_priority); /*---------------------------------------------------------------- - Function: OS_TaskGetId_Impl Purpose: Obtain the OSAL task ID of the caller @@ -149,7 +139,6 @@ int32 OS_TaskSetPriority_Impl(const OS_object_token_t *token, osal_priority_t ne osal_id_t OS_TaskGetId_Impl(void); /*---------------------------------------------------------------- - Function: OS_TaskGetInfo_Impl Purpose: Obtain OS-specific information about a task @@ -159,8 +148,6 @@ int32 OS_TaskGetInfo_Impl(const OS_object_token_t *token, OS_task_prop_t *task_p /*---------------------------------------------------------------- - Function: OS_TaskRegister_Impl - Purpose: Perform registration actions after new task creation NOTE: This is invoked via the OS_TaskEntryPoint() immediately @@ -172,8 +159,6 @@ int32 OS_TaskRegister_Impl(osal_id_t global_task_id); /*---------------------------------------------------------------- - Function: OS_TaskIdMatchSystemData_Impl - Purpose: A helper "match" function to find an OSAL task ID based on system ID Compatible with the "OS_ObjectIdFindBySearch" routine @@ -182,8 +167,6 @@ bool OS_TaskIdMatchSystemData_Impl(void *ref, const OS_object_token_t *token, co /*---------------------------------------------------------------- - Function: OS_TaskValidateSystemData_Impl - Purpose: Checks that the supplied sysdata pointer and sysdata_size are compatible/reasonable for the underlying OS. diff --git a/src/os/shared/inc/os-shared-timebase.h b/src/os/shared/inc/os-shared-timebase.h index d0f81c3d6..a1445a575 100644 --- a/src/os/shared/inc/os-shared-timebase.h +++ b/src/os/shared/inc/os-shared-timebase.h @@ -66,7 +66,6 @@ int32 OS_TimeBaseAPI_Init(void); */ /*---------------------------------------------------------------- - Function: OS_TimeBaseCreate_Impl Purpose: Prepare OS resources for a time base @@ -75,7 +74,6 @@ int32 OS_TimeBaseAPI_Init(void); int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_TimeBaseSet_Impl Purpose: Configure the OS resources to provide a timer tick @@ -84,7 +82,6 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token); int32 OS_TimeBaseSet_Impl(const OS_object_token_t *token, uint32 start_time, uint32 interval_time); /*---------------------------------------------------------------- - Function: OS_TimeBaseDelete_Impl Purpose: Free the OS resources associated with the time base @@ -97,7 +94,6 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token); ****************************************************************************************/ /*---------------------------------------------------------------- - Function: OS_TimeBaseLock_Impl Purpose: Get exclusive access to the given timebase Add/remove of application callbacks is prevented @@ -105,7 +101,6 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token); void OS_TimeBaseLock_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_TimeBaseLock_Impl Purpose: Release exclusive access to the given timebase Add/remove of application callbacks is allowed @@ -113,7 +108,6 @@ void OS_TimeBaseLock_Impl(const OS_object_token_t *token); void OS_TimeBaseUnlock_Impl(const OS_object_token_t *token); /*---------------------------------------------------------------- - Function: OS_TimeBaseGetInfo_Impl Purpose: Obtain the OS-specific time base information, if any @@ -122,7 +116,6 @@ void OS_TimeBaseUnlock_Impl(const OS_object_token_t *token); int32 OS_TimeBaseGetInfo_Impl(const OS_object_token_t *token, OS_timebase_prop_t *timer_prop); /*---------------------------------------------------------------- - Function: OS_TimeBase_CallbackThread Purpose: Implement the time base helper thread This is the context for providing application callbacks @@ -130,7 +123,6 @@ int32 OS_TimeBaseGetInfo_Impl(const OS_object_token_t *token, OS_timebase_prop_t void OS_TimeBase_CallbackThread(osal_id_t timebase_id); /*---------------------------------------------------------------- - Function: OS_Milli2Ticks Purpose: Convert milliseconds to ticks ------------------------------------------------------------------*/ diff --git a/src/os/shared/src/osapi-binsem.c b/src/os/shared/src/osapi-binsem.c index 5f8af86f5..9bab028d8 100644 --- a/src/os/shared/src/osapi-binsem.c +++ b/src/os/shared/src/osapi-binsem.c @@ -72,8 +72,6 @@ OS_bin_sem_internal_record_t OS_bin_sem_table[LOCAL_NUM_OBJECTS]; ---------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------- - * - * Function: OS_BinSemAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -82,11 +80,9 @@ int32 OS_BinSemAPI_Init(void) { memset(OS_bin_sem_table, 0, sizeof(OS_bin_sem_table)); return OS_SUCCESS; -} /* end OS_BinSemAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -119,12 +115,9 @@ int32 OS_BinSemCreate(osal_id_t *sem_id, const char *sem_name, uint32 sem_initia } return return_code; - -} /* end OS_BinSemCreate */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemDelete * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -145,12 +138,9 @@ int32 OS_BinSemDelete(osal_id_t sem_id) } return return_code; - -} /* end OS_BinSemDelete */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGive * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -169,12 +159,9 @@ int32 OS_BinSemGive(osal_id_t sem_id) } return return_code; - -} /* end OS_BinSemGive */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemFlush * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -193,11 +180,9 @@ int32 OS_BinSemFlush(osal_id_t sem_id) } return return_code; -} /* end OS_BinSemFlush */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemTake * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -216,11 +201,9 @@ int32 OS_BinSemTake(osal_id_t sem_id) } return return_code; -} /* end OS_BinSemTake */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemTimedWait * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -239,11 +222,9 @@ int32 OS_BinSemTimedWait(osal_id_t sem_id, uint32 msecs) } return return_code; -} /* end OS_BinSemTimedWait */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -260,11 +241,9 @@ int32 OS_BinSemGetIdByName(osal_id_t *sem_id, const char *sem_name) return_code = OS_ObjectIdFindByName(LOCAL_OBJID_TYPE, sem_name, sem_id); return return_code; -} /* end OS_BinSemGetIdByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -295,4 +274,4 @@ int32 OS_BinSemGetInfo(osal_id_t sem_id, OS_bin_sem_prop_t *bin_prop) } return return_code; -} /* end OS_BinSemGetInfo */ +} diff --git a/src/os/shared/src/osapi-clock.c b/src/os/shared/src/osapi-clock.c index 8ae60c5de..bd42eb0c7 100644 --- a/src/os/shared/src/osapi-clock.c +++ b/src/os/shared/src/osapi-clock.c @@ -39,8 +39,6 @@ #include "os-shared-clock.h" /*---------------------------------------------------------------- - * - * Function: OS_GetLocalTime * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -52,12 +50,9 @@ int32 OS_GetLocalTime(OS_time_t *time_struct) OS_CHECK_POINTER(time_struct); return OS_GetLocalTime_Impl(time_struct); - -} /* end OS_GetLocalTime */ +} /*---------------------------------------------------------------- - * - * Function: OS_SetLocalTime * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -69,5 +64,4 @@ int32 OS_SetLocalTime(const OS_time_t *time_struct) OS_CHECK_POINTER(time_struct); return OS_SetLocalTime_Impl(time_struct); - -} /* end OS_SetLocalTime */ +} diff --git a/src/os/shared/src/osapi-common.c b/src/os/shared/src/osapi-common.c index c8d68a60e..6e13a7170 100644 --- a/src/os/shared/src/osapi-common.c +++ b/src/os/shared/src/osapi-common.c @@ -68,8 +68,6 @@ OS_SharedGlobalVars_t OS_SharedGlobalVars = { }; /*---------------------------------------------------------------- - * - * Function: OS_NotifyEvent * * Purpose: Helper function to invoke the user-defined event handler * @@ -97,8 +95,6 @@ int32 OS_NotifyEvent(OS_Event_t event, osal_id_t object_id, void *data) */ /*---------------------------------------------------------------- - * - * Function: OS_API_Init * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -246,11 +242,9 @@ int32 OS_API_Init(void) } return return_code; -} /* end OS_API_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_API_Teardown * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -271,8 +265,6 @@ void OS_API_Teardown(void) } /*---------------------------------------------------------------- - * - * Function: OS_RegisterEventHandler * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -287,8 +279,6 @@ int32 OS_RegisterEventHandler(OS_EventHandler_t handler) } /*---------------------------------------------------------------- - * - * Function: OS_ApplicationExit * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -304,11 +294,9 @@ void OS_ApplicationExit(int32 Status) { exit(EXIT_FAILURE); } -} /* end OS_ApplicationExit */ +} /*---------------------------------------------------------------- - * - * Function: OS_CleanUpObject * * Purpose: Local helper routine that can delete ANY object, not part of OSAL API. * @@ -357,11 +345,9 @@ void OS_CleanUpObject(osal_id_t object_id, void *arg) default: break; } -} /* end OS_CleanUpObject */ +} /*---------------------------------------------------------------- - * - * Function: OS_DeleteAllObjects * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -396,11 +382,9 @@ void OS_DeleteAllObjects(void) } OS_TaskDelay(5); } -} /* end OS_DeleteAllObjects */ +} /*---------------------------------------------------------------- - * - * Function: OS_IdleLoop * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -417,11 +401,9 @@ void OS_IdleLoop() { OS_IdleLoop_Impl(); } -} /* end OS_IdleLoop */ +} /*---------------------------------------------------------------- - * - * Function: OS_ApplicationShutdown * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -440,4 +422,4 @@ void OS_ApplicationShutdown(uint8 flag) * should do whatever is needed to wake that task up. */ OS_ApplicationShutdown_Impl(); -} /* end OS_ApplicationShutdown */ +} diff --git a/src/os/shared/src/osapi-condvar.c b/src/os/shared/src/osapi-condvar.c index cc3dceb69..1407c5262 100644 --- a/src/os/shared/src/osapi-condvar.c +++ b/src/os/shared/src/osapi-condvar.c @@ -59,8 +59,6 @@ OS_condvar_internal_record_t OS_condvar_table[OS_MAX_CONDVARS]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_CondVarAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -73,8 +71,6 @@ int32 OS_CondVarAPI_Init(void) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -110,8 +106,6 @@ int32 OS_CondVarCreate(osal_id_t *var_id, const char *var_name, uint32 options) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarDelete * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -135,8 +129,6 @@ int32 OS_CondVarDelete(osal_id_t var_id) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarLock * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -158,8 +150,6 @@ int32 OS_CondVarLock(osal_id_t var_id) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarUnlock * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -181,8 +171,6 @@ int32 OS_CondVarUnlock(osal_id_t var_id) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarSignal * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -204,8 +192,6 @@ int32 OS_CondVarSignal(osal_id_t var_id) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarBroadcast * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -227,8 +213,6 @@ int32 OS_CondVarBroadcast(osal_id_t var_id) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarWait * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -250,8 +234,6 @@ int32 OS_CondVarWait(osal_id_t var_id) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarTimedWait * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -276,8 +258,6 @@ int32 OS_CondVarTimedWait(osal_id_t var_id, const OS_time_t *abs_wakeup_time) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -297,8 +277,6 @@ int32 OS_CondVarGetIdByName(osal_id_t *var_id, const char *var_name) } /*---------------------------------------------------------------- - * - * Function: OS_CondVarGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail diff --git a/src/os/shared/src/osapi-countsem.c b/src/os/shared/src/osapi-countsem.c index b273d3096..bc2bb93cc 100644 --- a/src/os/shared/src/osapi-countsem.c +++ b/src/os/shared/src/osapi-countsem.c @@ -63,8 +63,6 @@ OS_count_sem_internal_record_t OS_count_sem_table[LOCAL_NUM_OBJECTS]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_CountSemAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -74,11 +72,9 @@ int32 OS_CountSemAPI_Init(void) { memset(OS_count_sem_table, 0, sizeof(OS_count_sem_table)); return OS_SUCCESS; -} /* end OS_CountSemAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -111,12 +107,9 @@ int32 OS_CountSemCreate(osal_id_t *sem_id, const char *sem_name, uint32 sem_init } return return_code; - -} /* end OS_CountSemCreate */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemDelete * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -137,12 +130,9 @@ int32 OS_CountSemDelete(osal_id_t sem_id) } return return_code; - -} /* end OS_CountSemDelete */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGive * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -161,12 +151,9 @@ int32 OS_CountSemGive(osal_id_t sem_id) } return return_code; - -} /* end OS_CountSemGive */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemTake * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -185,11 +172,9 @@ int32 OS_CountSemTake(osal_id_t sem_id) } return return_code; -} /* end OS_CountSemTake */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemTimedWait * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -208,11 +193,9 @@ int32 OS_CountSemTimedWait(osal_id_t sem_id, uint32 msecs) } return return_code; -} /* end OS_CountSemTimedWait */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -229,11 +212,9 @@ int32 OS_CountSemGetIdByName(osal_id_t *sem_id, const char *sem_name) return_code = OS_ObjectIdFindByName(LOCAL_OBJID_TYPE, sem_name, sem_id); return return_code; -} /* end OS_CountSemGetIdByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -265,4 +246,4 @@ int32 OS_CountSemGetInfo(osal_id_t sem_id, OS_count_sem_prop_t *count_prop) } return return_code; -} /* end OS_CountSemGetInfo */ +} diff --git a/src/os/shared/src/osapi-debug.c b/src/os/shared/src/osapi-debug.c index bd908c915..5f9c20078 100644 --- a/src/os/shared/src/osapi-debug.c +++ b/src/os/shared/src/osapi-debug.c @@ -45,8 +45,6 @@ #define OS_DEBUG_MAX_LINE_LEN 132 /*---------------------------------------------------------------- - * - * Function: OS_DebugPrintf * * Purpose: Outputs a single debug statement to the console * @@ -75,5 +73,4 @@ void OS_DebugPrintf(uint32 Level, const char *Func, uint32 Line, const char *For OS_BSP_Unlock_Impl(); } - -} /* end OS_DebugPrintf */ +} diff --git a/src/os/shared/src/osapi-dir.c b/src/os/shared/src/osapi-dir.c index eb3162800..2404d5cee 100644 --- a/src/os/shared/src/osapi-dir.c +++ b/src/os/shared/src/osapi-dir.c @@ -65,8 +65,6 @@ OS_dir_internal_record_t OS_dir_table[LOCAL_NUM_OBJECTS]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_DirAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -76,11 +74,9 @@ int32 OS_DirAPI_Init(void) { memset(OS_dir_table, 0, sizeof(OS_dir_table)); return OS_SUCCESS; -} /* end OS_DirAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_mkdir * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -98,12 +94,9 @@ int32 OS_mkdir(const char *path, uint32 access) } return return_code; - -} /* end OS_mkdir */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirectoryOpen * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -140,11 +133,9 @@ int32 OS_DirectoryOpen(osal_id_t *dir_id, const char *path) } return return_code; -} /* end OS_DirectoryOpen */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirectoryClose * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -166,11 +157,9 @@ int32 OS_DirectoryClose(osal_id_t dir_id) } return return_code; -} /* end OS_DirectoryClose */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirectoryRead * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -204,12 +193,9 @@ int32 OS_DirectoryRead(osal_id_t dir_id, os_dirent_t *dirent) } return return_code; - -} /* end OS_DirectoryRead */ +} /*---------------------------------------------------------------- - * - * Function: OS_DirectoryRewind * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -228,11 +214,9 @@ int32 OS_DirectoryRewind(osal_id_t dir_id) } return return_code; -} /* end OS_DirectoryRewind */ +} /*---------------------------------------------------------------- - * - * Function: OS_rmdir * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -250,5 +234,4 @@ int32 OS_rmdir(const char *path) } return return_code; - -} /* end OS_rmdir */ +} diff --git a/src/os/shared/src/osapi-errors.c b/src/os/shared/src/osapi-errors.c index acd7a039c..253b7fa36 100644 --- a/src/os/shared/src/osapi-errors.c +++ b/src/os/shared/src/osapi-errors.c @@ -99,8 +99,6 @@ static const OS_ErrorTable_Entry_t OS_GLOBAL_ERROR_NAME_TABLE[] = { */ /*---------------------------------------------------------------- - * - * Function: OS_StatusToString * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -119,8 +117,6 @@ char *OS_StatusToString(osal_status_t status, os_status_string_t *status_string) } /*---------------------------------------------------------------- - * - * Function: OS_GetErrorName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -164,4 +160,4 @@ int32 OS_GetErrorName(int32 error_num, os_err_name_t *err_name) (*err_name)[OS_ERROR_NAME_LENGTH - 1] = '\0'; return return_code; -} /* end OS_GetErrorName */ +} diff --git a/src/os/shared/src/osapi-file.c b/src/os/shared/src/osapi-file.c index fcd826349..ebe77b98a 100644 --- a/src/os/shared/src/osapi-file.c +++ b/src/os/shared/src/osapi-file.c @@ -87,8 +87,6 @@ int32 OS_FileIteratorClose(osal_id_t filedes, void *arg) ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_FileAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -98,11 +96,9 @@ int32 OS_FileAPI_Init(void) { memset(OS_stream_table, 0, sizeof(OS_stream_table)); return OS_SUCCESS; -} /* end OS_FileAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_OpenCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -154,11 +150,9 @@ int32 OS_OpenCreate(osal_id_t *filedes, const char *path, int32 flags, int32 acc } return return_code; -} /* end OS_OpenCreate */ +} /*---------------------------------------------------------------- - * - * Function: OS_close * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -180,12 +174,9 @@ int32 OS_close(osal_id_t filedes) } return return_code; - -} /* end OS_close */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimedRead * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -209,11 +200,9 @@ int32 OS_TimedRead(osal_id_t filedes, void *buffer, size_t nbytes, int32 timeout } return return_code; -} /* end OS_TimedRead */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimedWrite * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -236,11 +225,9 @@ int32 OS_TimedWrite(osal_id_t filedes, const void *buffer, size_t nbytes, int32 } return return_code; -} /* end OS_TimedWrite */ +} /*---------------------------------------------------------------- - * - * Function: OS_read * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -249,11 +236,9 @@ int32 OS_TimedWrite(osal_id_t filedes, const void *buffer, size_t nbytes, int32 int32 OS_read(osal_id_t filedes, void *buffer, size_t nbytes) { return OS_TimedRead(filedes, buffer, nbytes, OS_PEND); -} /* end OS_read */ +} /*---------------------------------------------------------------- - * - * Function: OS_write * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -262,11 +247,9 @@ int32 OS_read(osal_id_t filedes, void *buffer, size_t nbytes) int32 OS_write(osal_id_t filedes, const void *buffer, size_t nbytes) { return OS_TimedWrite(filedes, buffer, nbytes, OS_PEND); -} /* end OS_write */ +} /*---------------------------------------------------------------- - * - * Function: OS_chmod * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -284,12 +267,9 @@ int32 OS_chmod(const char *path, uint32 access_mode) } return return_code; - -} /* end OS_chmod */ +} /*---------------------------------------------------------------- - * - * Function: OS_stat * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -312,11 +292,9 @@ int32 OS_stat(const char *path, os_fstat_t *filestats) } return return_code; -} /* end OS_stat */ +} /*---------------------------------------------------------------- - * - * Function: OS_lseek * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -336,11 +314,9 @@ int32 OS_lseek(osal_id_t filedes, int32 offset, uint32 whence) } return return_code; -} /* end OS_lseek */ +} /*---------------------------------------------------------------- - * - * Function: OS_remove * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -358,12 +334,9 @@ int32 OS_remove(const char *path) } return return_code; - -} /* end OS_remove */ +} /*---------------------------------------------------------------- - * - * Function: OS_rename * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -407,12 +380,9 @@ int32 OS_rename(const char *old, const char *new) } return return_code; - -} /* end OS_rename */ +} /*---------------------------------------------------------------- - * - * Function: OS_cp * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -475,12 +445,9 @@ int32 OS_cp(const char *src, const char *dest) } return return_code; - -} /* end OS_cp */ +} /*---------------------------------------------------------------- - * - * Function: OS_mv * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -502,12 +469,9 @@ int32 OS_mv(const char *src, const char *dest) } return return_code; - -} /* end OS_mv */ +} /*---------------------------------------------------------------- - * - * Function: OS_FDGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -541,12 +505,9 @@ int32 OS_FDGetInfo(osal_id_t filedes, OS_file_prop_t *fd_prop) } return return_code; - -} /* end OS_FDGetInfo */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileOpenCheck * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -578,11 +539,9 @@ int32 OS_FileOpenCheck(const char *Filename) OS_ObjectIdIteratorDestroy(&iter); return return_code; -} /* end OS_FileOpenCheck */ +} /*---------------------------------------------------------------- - * - * Function: OS_CloseFileByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -621,12 +580,9 @@ int32 OS_CloseFileByName(const char *Filename) OS_ObjectIdIteratorDestroy(&iter); return return_code; - -} /* end OS_CloseFileByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_CloseAllFiles * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -655,5 +611,4 @@ int32 OS_CloseAllFiles(void) OS_ObjectIdIteratorDestroy(&iter); return return_code; - -} /* end OS_CloseAllFiles */ +} diff --git a/src/os/shared/src/osapi-filesys.c b/src/os/shared/src/osapi-filesys.c index 7d608abe6..74fe269a4 100644 --- a/src/os/shared/src/osapi-filesys.c +++ b/src/os/shared/src/osapi-filesys.c @@ -63,8 +63,6 @@ OS_filesys_internal_record_t OS_filesys_table[LOCAL_NUM_OBJECTS]; const char OS_FILESYS_RAMDISK_VOLNAME_PREFIX[] = "RAM"; /*---------------------------------------------------------------- - * - * Function: OS_FileSysFilterFree * * Purpose: Local helper routine, not part of OSAL API. * Iterator function to match only the free/open entries @@ -78,8 +76,6 @@ bool OS_FileSysFilterFree(void *ref, const OS_object_token_t *token, const OS_co } /*---------------------------------------------------------------- - * - * Function: OS_FileSys_FindVirtMountPoint * * Purpose: Local helper routine, not part of OSAL API. * Checks if the filesys table index matches the "virtual_mountpt" field. @@ -122,11 +118,9 @@ bool OS_FileSys_FindVirtMountPoint(void *ref, const OS_object_token_t *token, co * for target=/mnt/abcd - this should return false in that case. */ return (target[mplen] == '/' || target[mplen] == 0); -} /* end OS_FileSys_FindVirtMountPoint */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSys_Initialize * * Purpose: Local helper routine, not part of OSAL API. * Implements Common code between the mkfs and initfs calls - @@ -219,16 +213,13 @@ int32 OS_FileSys_Initialize(char *address, const char *fsdevname, const char *fs } return return_code; - -} /* end OS_FileSys_Initialize */ +} /**************************************************************************************** INITIALIZATION ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_FileSysAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -240,11 +231,9 @@ int32 OS_FileSysAPI_Init(void) memset(OS_filesys_table, 0, sizeof(OS_filesys_table)); return return_code; -} /* end OS_FileSysAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysAddFixedMap * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -325,11 +314,9 @@ int32 OS_FileSysAddFixedMap(osal_id_t *filesys_id, const char *phys_path, const } return return_code; -} /* end OS_FileSysAddFixedMap */ +} /*---------------------------------------------------------------- - * - * Function: OS_mkfs * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -354,12 +341,9 @@ int32 OS_mkfs(char *address, const char *devname, const char *volname, size_t bl } return return_code; - -} /* end OS_mkfs */ +} /*---------------------------------------------------------------- - * - * Function: OS_rmfs * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -395,11 +379,9 @@ int32 OS_rmfs(const char *devname) } return return_code; -} /* end OS_rmfs */ +} /*---------------------------------------------------------------- - * - * Function: OS_initfs * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -424,12 +406,9 @@ int32 OS_initfs(char *address, const char *devname, const char *volname, size_t } return return_code; - -} /* end OS_initfs */ +} /*---------------------------------------------------------------- - * - * Function: OS_mount * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -492,12 +471,9 @@ int32 OS_mount(const char *devname, const char *mountpoint) } return return_code; - -} /* end OS_mount */ +} /*---------------------------------------------------------------- - * - * Function: OS_unmount * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -553,11 +529,9 @@ int32 OS_unmount(const char *mountpoint) } return return_code; -} /* end OS_unmount */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysStatVolume * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -583,12 +557,9 @@ int32 OS_FileSysStatVolume(const char *name, OS_statvfs_t *statbuf) } return return_code; - -} /* end OS_FileSysStatVolume */ +} /*---------------------------------------------------------------- - * - * Function: OS_chkfs * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -614,12 +585,9 @@ int32 OS_chkfs(const char *name, bool repair) } return return_code; - -} /* end OS_chkfs */ +} /*---------------------------------------------------------------- - * - * Function: OS_FS_GetPhysDriveName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -661,11 +629,9 @@ int32 OS_FS_GetPhysDriveName(char *PhysDriveName, const char *MountPoint) } return return_code; -} /* end OS_FS_GetPhysDriveName */ +} /*---------------------------------------------------------------- - * - * Function: OS_GetFsInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -698,11 +664,9 @@ int32 OS_GetFsInfo(os_fsinfo_t *filesys_info) OS_ObjectIdIteratorDestroy(&iter); return OS_SUCCESS; -} /* end OS_GetFsInfo */ +} /*---------------------------------------------------------------- - * - * Function: OS_TranslatePath * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -810,5 +774,4 @@ int32 OS_TranslatePath(const char *VirtualPath, char *LocalPath) } return return_code; - -} /* end OS_TranslatePath */ +} diff --git a/src/os/shared/src/osapi-heap.c b/src/os/shared/src/osapi-heap.c index db262f9db..c598e5a11 100644 --- a/src/os/shared/src/osapi-heap.c +++ b/src/os/shared/src/osapi-heap.c @@ -39,8 +39,6 @@ #include "os-shared-heap.h" /*---------------------------------------------------------------- - * - * Function: OS_HeapGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -52,4 +50,4 @@ int32 OS_HeapGetInfo(OS_heap_prop_t *heap_prop) OS_CHECK_POINTER(heap_prop); return OS_HeapGetInfo_Impl(heap_prop); -} /* end OS_HeapGetInfo */ +} diff --git a/src/os/shared/src/osapi-idmap.c b/src/os/shared/src/osapi-idmap.c index 2733741de..142875992 100644 --- a/src/os/shared/src/osapi-idmap.c +++ b/src/os/shared/src/osapi-idmap.c @@ -85,7 +85,6 @@ typedef struct /* The key required to unlock this table */ osal_key_t owner_key; - } OS_objtype_state_t; OS_objtype_state_t OS_objtype_state[OS_OBJECT_TYPE_USER]; @@ -111,8 +110,6 @@ OS_common_record_t *const OS_global_condvar_table = &OS_common_table[OS_CONDVA */ /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdInit * * Purpose: Local helper routine, not part of OSAL API. * clears the entire table and brings it to a proper initial state @@ -123,11 +120,9 @@ int32 OS_ObjectIdInit(void) memset(OS_common_table, 0, sizeof(OS_common_table)); memset(OS_objtype_state, 0, sizeof(OS_objtype_state)); return OS_SUCCESS; -} /* end OS_ObjectIdInit */ +} /*---------------------------------------------------------------- - * - * Function: OS_GetMaxForObjectType * * Purpose: Local helper routine, not part of OSAL API. * @@ -165,11 +160,9 @@ uint32 OS_GetMaxForObjectType(osal_objtype_t idtype) default: return 0; } -} /* end OS_GetMaxForObjectType */ +} /*---------------------------------------------------------------- - * - * Function: OS_GetBaseForObjectType * * Purpose: Local helper routine, not part of OSAL API. * @@ -207,7 +200,7 @@ uint32 OS_GetBaseForObjectType(osal_objtype_t idtype) default: return 0; } -} /* end OS_GetBaseForObjectType */ +} /************************************************************** * LOCAL HELPER FUNCTIONS @@ -215,8 +208,6 @@ uint32 OS_GetBaseForObjectType(osal_objtype_t idtype) **************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ForEachFilterCreator * * Purpose: Local helper routine, not part of OSAL API. * Determine if the object is a match for "foreach" operations @@ -235,8 +226,6 @@ bool OS_ForEachFilterCreator(void *ref, const OS_object_token_t *token, const OS } /*---------------------------------------------------------------- - * - * Function: OS_ForEachDoCallback * * Purpose: Local helper routine, not part of OSAL API. * Invoke the user-specified callback routine @@ -252,8 +241,6 @@ int32 OS_ForEachDoCallback(osal_id_t obj_id, void *ref) } /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdGlobalFromToken * * Purpose: Local helper routine, not part of OSAL API. * Gets the global/common record associated with the token @@ -268,8 +255,6 @@ OS_common_record_t *OS_ObjectIdGlobalFromToken(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_ObjectNameMatch * * Purpose: Local helper routine, not part of OSAL API. * A matching function to compare the name of the record against @@ -284,11 +269,9 @@ OS_common_record_t *OS_ObjectIdGlobalFromToken(const OS_object_token_t *token) bool OS_ObjectNameMatch(void *ref, const OS_object_token_t *token, const OS_common_record_t *obj) { return (obj->name_entry != NULL && strcmp((const char *)ref, obj->name_entry) == 0); -} /* end OS_ObjectNameMatch */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdTransactionInit * * Purpose: Local helper routine, not part of OSAL API. * Initiate the locking process for the given mode and ID type, prior @@ -343,12 +326,9 @@ int32 OS_ObjectIdTransactionInit(OS_lock_mode_t lock_mode, osal_objtype_t idtype } return OS_SUCCESS; - -} /* end OS_ObjectIdTransactionInit */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdTransactionInit * * Purpose: Local helper routine, not part of OSAL API. * Cancels/aborts a previously initialized transaction @@ -364,8 +344,6 @@ void OS_ObjectIdTransactionCancel(OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdConvertToken * * Purpose: Local helper routine, not part of OSAL API. * @@ -543,12 +521,9 @@ int32 OS_ObjectIdConvertToken(OS_object_token_t *token) } return return_code; - -} /* end OS_ObjectIdConvertToken */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdFindNextMatch * * Purpose: Local helper routine, not part of OSAL API. * Locate an existing object using the supplied Match function. @@ -592,11 +567,9 @@ int32 OS_ObjectIdFindNextMatch(OS_ObjectMatchFunc_t MatchFunc, void *arg, OS_obj } return return_code; -} /* end OS_ObjectIdFindNextMatch */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdFindNextFree * * Purpose: Local helper routine, not part of OSAL API. * Find the next available Object ID of the given type @@ -679,7 +652,7 @@ int32 OS_ObjectIdFindNextFree(OS_object_token_t *token) } return return_code; -} /* end OS_ObjectIdFindNextFree */ +} /* ********************************************************************************* @@ -691,7 +664,6 @@ int32 OS_ObjectIdFindNextFree(OS_object_token_t *token) */ /*---------------------------------------------------------------- - Function: OS_Lock_Global Purpose: Locks the global table identified by "idtype" ------------------------------------------------------------------*/ @@ -756,7 +728,6 @@ void OS_Lock_Global(OS_object_token_t *token) } /*---------------------------------------------------------------- - Function: OS_Unlock_Global Purpose: Unlocks the global table identified by "idtype" ------------------------------------------------------------------*/ @@ -798,8 +769,6 @@ void OS_Unlock_Global(OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_WaitForStateChange * * Purpose: Local helper routine, not part of OSAL API. * Waits for a change in the global table identified by "idtype" @@ -841,8 +810,6 @@ void OS_WaitForStateChange(OS_object_token_t *token, uint32 attempts) } /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdFinalizeNew * * Purpose: Local helper routine, not part of OSAL API. * Called when the initialization of a newly-issued object ID is fully complete, @@ -894,10 +861,9 @@ int32 OS_ObjectIdFinalizeNew(int32 operation_status, OS_object_token_t *token, o } return operation_status; -} /* end OS_ObjectIdFinalizeNew(, &token, ) */ +} /*---------------------------------------------------------------- - Function: OS_ObjectIdFinalizeDelete Purpose: Helper routine, not part of OSAL public API. See description in prototype @@ -930,8 +896,6 @@ int32 OS_ObjectIdFinalizeDelete(int32 operation_status, OS_object_token_t *token } /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdGetBySearch * * Purpose: Local helper routine, not part of OSAL API. * Locate an existing object using the supplied Match function. @@ -967,11 +931,9 @@ int32 OS_ObjectIdGetBySearch(OS_lock_mode_t lock_mode, osal_objtype_t idtype, OS } return return_code; -} /* end OS_ObjectIdGetBySearch */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdGetByName * * Purpose: Local helper routine, not part of OSAL API. * Locate an existing object with matching name and type @@ -986,12 +948,9 @@ int32 OS_ObjectIdGetBySearch(OS_lock_mode_t lock_mode, osal_objtype_t idtype, OS int32 OS_ObjectIdGetByName(OS_lock_mode_t lock_mode, osal_objtype_t idtype, const char *name, OS_object_token_t *token) { return OS_ObjectIdGetBySearch(lock_mode, idtype, OS_ObjectNameMatch, (void *)name, token); - -} /* end OS_ObjectIdGetByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdFindByName * * Purpose: Local helper routine, not part of OSAL API. * Locate an existing object with matching name and type @@ -1022,12 +981,9 @@ int32 OS_ObjectIdFindByName(osal_objtype_t idtype, const char *name, osal_id_t * } return return_code; - -} /* end OS_ObjectIdFindByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdGetById * * Purpose: Local helper routine, not part of OSAL API. * Gets the resource record pointer and index associated with the given resource ID. @@ -1073,11 +1029,9 @@ int32 OS_ObjectIdGetById(OS_lock_mode_t lock_mode, osal_objtype_t idtype, osal_i } return return_code; -} /* end OS_ObjectIdGetById */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdTransactionFinish * * Purpose: Complete a transaction which was previously obtained via * OS_ObjectIdGetById() or OS_ObjectIdGetBySearch(). @@ -1145,8 +1099,6 @@ void OS_ObjectIdTransactionFinish(OS_object_token_t *token, const osal_id_t *fin } /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdRelease * * Purpose: Release/Unlock a transaction token which was previously obtained via * OS_ObjectIdGetById() or OS_ObjectIdGetBySearch(). @@ -1164,8 +1116,6 @@ void OS_ObjectIdRelease(OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdAllocateNew * * Purpose: Local helper routine, not part of OSAL API. * Locks the global table for the indicated ID type and allocates a @@ -1258,10 +1208,9 @@ int32 OS_ObjectIdAllocateNew(osal_objtype_t idtype, const char *name, OS_object_ } return return_code; -} /* end OS_ObjectIdAllocateNew */ +} /*---------------------------------------------------------------- - Function: OS_ObjectIdTransferToken Purpose: Transfer ownership of a token to another buffer ------------------------------------------------------------------*/ @@ -1279,7 +1228,6 @@ void OS_ObjectIdTransferToken(OS_object_token_t *token_from, OS_object_token_t * } /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorInit Purpose: Start the process of iterating through OSAL objects ------------------------------------------------------------------*/ @@ -1295,7 +1243,6 @@ int32 OS_ObjectIdIteratorInit(OS_ObjectMatchFunc_t matchfunc, void *matcharg, os } /*---------------------------------------------------------------- - Function: OS_ObjectFilterActive Purpose: Match function to iterate only active objects ------------------------------------------------------------------*/ @@ -1305,7 +1252,6 @@ bool OS_ObjectFilterActive(void *ref, const OS_object_token_t *token, const OS_c } /*---------------------------------------------------------------- - Function: OS_ObjectIdIterateActive Purpose: Start the process of iterating through OSAL objects ------------------------------------------------------------------*/ @@ -1315,7 +1261,6 @@ int32 OS_ObjectIdIterateActive(osal_objtype_t objtype, OS_object_iter_t *iter) } /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorGetNext Purpose: Move iterator to the next entry ------------------------------------------------------------------*/ @@ -1344,10 +1289,9 @@ bool OS_ObjectIdIteratorGetNext(OS_object_iter_t *iter) } while (!got_next); return got_next; -} /* end OS_ObjectIdIteratorGetNext */ +} /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorDestroy Purpose: Release iterator resources ------------------------------------------------------------------*/ @@ -1357,7 +1301,6 @@ void OS_ObjectIdIteratorDestroy(OS_object_iter_t *iter) } /*---------------------------------------------------------------- - Function: OS_ObjectIdIteratorProcessEntry Purpose: Call a handler function on an iterator object ID ------------------------------------------------------------------*/ @@ -1383,8 +1326,6 @@ int32 OS_ObjectIdIteratorProcessEntry(OS_object_iter_t *iter, int32 (*func)(osal */ /*---------------------------------------------------------------- - * - * Function: OS_ConvertToArrayIndex * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -1394,11 +1335,9 @@ int32 OS_ConvertToArrayIndex(osal_id_t object_id, osal_index_t *ArrayIndex) { /* pass to conversion routine with undefined type */ return OS_ObjectIdToArrayIndex(OS_OBJECT_TYPE_UNDEFINED, object_id, ArrayIndex); -} /* end OS_ConvertToArrayIndex */ +} /*---------------------------------------------------------------- - * - * Function: OS_ForEachObject * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -1412,11 +1351,9 @@ void OS_ForEachObject(osal_id_t creator_id, OS_ArgCallback_t callback_ptr, void { OS_ForEachObjectOfType(idtype, creator_id, callback_ptr, callback_arg); } -} /* end OS_ForEachObject */ +} /*----------------------------------------------------------------- - * - * Function: OS_ForEachObjectOfType * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -1441,11 +1378,9 @@ void OS_ForEachObjectOfType(osal_objtype_t idtype, osal_id_t creator_id, OS_ArgC OS_ObjectIdIteratorDestroy(&iter); } -} /* end OS_ForEachObjectOfType */ +} /*---------------------------------------------------------------- - * - * Function: OS_IdentifyObject * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -1454,11 +1389,9 @@ void OS_ForEachObjectOfType(osal_objtype_t idtype, osal_id_t creator_id, OS_ArgC osal_objtype_t OS_IdentifyObject(osal_id_t object_id) { return OS_ObjectIdToType_Impl(object_id); -} /* end OS_IdentifyObject */ +} /*---------------------------------------------------------------- - * - * Function: OS_GetResourceName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -1504,11 +1437,9 @@ int32 OS_GetResourceName(osal_id_t object_id, char *buffer, size_t buffer_size) } return return_code; -} /* end OS_GetResourceName */ +} /*---------------------------------------------------------------- - * - * Function: OS_ObjectIdToArrayIndex * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -1550,4 +1481,4 @@ int32 OS_ObjectIdToArrayIndex(osal_objtype_t idtype, osal_id_t object_id, osal_i } return return_code; -} /* end OS_ObjectIdToArrayIndex */ +} diff --git a/src/os/shared/src/osapi-module.c b/src/os/shared/src/osapi-module.c index e8e18ff5f..34aec122b 100644 --- a/src/os/shared/src/osapi-module.c +++ b/src/os/shared/src/osapi-module.c @@ -83,8 +83,6 @@ extern OS_static_symbol_record_t OS_STATIC_SYMTABLE_SOURCE[]; #endif /* OS_STATIC_SYMTABLE_SOURCE */ /*---------------------------------------------------------------- - * - * Function: OS_SymbolLookup_Static * * Purpose: Local helper routine, not part of OSAL API. * Checks for a symbol name in the static symbol table @@ -118,11 +116,9 @@ int32 OS_SymbolLookup_Static(cpuaddr *SymbolAddress, const char *SymbolName, con } return return_code; -} /* end OS_SymbolLookup_Static */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleLoad_Static * * Purpose: Local helper routine, not part of OSAL API. * Checks for a module name in the static symbol table @@ -151,15 +147,13 @@ int32 OS_ModuleLoad_Static(const char *ModuleName) } return return_code; -} /* end OS_ModuleLoad_Static */ +} /**************************************************************************************** Module API ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ModuleAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -169,11 +163,9 @@ int32 OS_ModuleAPI_Init(void) { memset(OS_module_table, 0, sizeof(OS_module_table)); return OS_SUCCESS; -} /* end OS_ModuleAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleLoad * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -262,12 +254,9 @@ int32 OS_ModuleLoad(osal_id_t *module_id, const char *module_name, const char *f } return return_code; - -} /* end OS_ModuleLoad */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleUnload * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -299,11 +288,9 @@ int32 OS_ModuleUnload(osal_id_t module_id) } return return_code; -} /* end OS_ModuleUnload */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -336,12 +323,9 @@ int32 OS_ModuleInfo(osal_id_t module_id, OS_module_prop_t *module_prop) } return return_code; - -} /* end OS_ModuleInfo */ +} /*---------------------------------------------------------------- - * - * Function: OS_SymbolLookup * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -382,12 +366,9 @@ int32 OS_SymbolLookup(cpuaddr *SymbolAddress, const char *SymbolName) } return return_code; - -} /* end OS_SymbolLookup */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleSymbolLookup * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -431,12 +412,9 @@ int32 OS_ModuleSymbolLookup(osal_id_t module_id, cpuaddr *symbol_address, const } return return_code; - -} /* end OS_ModuleSymbolLookup */ +} /*---------------------------------------------------------------- - * - * Function: OS_SymbolTableDump * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -480,5 +458,4 @@ int32 OS_SymbolTableDump(const char *filename, size_t SizeLimit) OS_ObjectIdTransactionCancel(&token); return return_code; - -} /* end OS_SymbolTableDump */ +} diff --git a/src/os/shared/src/osapi-mutex.c b/src/os/shared/src/osapi-mutex.c index b981d558d..75e641c13 100644 --- a/src/os/shared/src/osapi-mutex.c +++ b/src/os/shared/src/osapi-mutex.c @@ -68,8 +68,6 @@ OS_mutex_internal_record_t OS_mutex_table[LOCAL_NUM_OBJECTS]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_MutexAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -79,11 +77,9 @@ int32 OS_MutexAPI_Init(void) { memset(OS_mutex_table, 0, sizeof(OS_mutex_table)); return OS_SUCCESS; -} /* end OS_MutexAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -116,12 +112,9 @@ int32 OS_MutSemCreate(osal_id_t *sem_id, const char *sem_name, uint32 options) } return return_code; - -} /* end OS_MutSemCreate */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemDelete * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -142,12 +135,9 @@ int32 OS_MutSemDelete(osal_id_t sem_id) } return return_code; - -} /* end OS_MutSemDelete */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGive * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -180,12 +170,9 @@ int32 OS_MutSemGive(osal_id_t sem_id) } return return_code; - -} /* end OS_MutSemGive */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemTake * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -212,12 +199,9 @@ int32 OS_MutSemTake(osal_id_t sem_id) } return return_code; - -} /* end OS_MutSemTake */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -234,12 +218,9 @@ int32 OS_MutSemGetIdByName(osal_id_t *sem_id, const char *sem_name) return_code = OS_ObjectIdFindByName(LOCAL_OBJID_TYPE, sem_name, sem_id); return return_code; - -} /* end OS_MutSemGetIdByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -270,5 +251,4 @@ int32 OS_MutSemGetInfo(osal_id_t sem_id, OS_mut_sem_prop_t *mut_prop) } return return_code; - -} /* end OS_MutSemGetInfo */ +} diff --git a/src/os/shared/src/osapi-network.c b/src/os/shared/src/osapi-network.c index 7f72b5ecc..85d86cbbc 100644 --- a/src/os/shared/src/osapi-network.c +++ b/src/os/shared/src/osapi-network.c @@ -42,8 +42,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_NetworkAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -51,11 +49,9 @@ int32 OS_NetworkAPI_Init(void) { return OS_SUCCESS; -} /* end OS_NetworkAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetHostName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -78,11 +74,9 @@ int32 OS_NetworkGetHostName(char *host_name, size_t name_len) } return return_code; -} /* end OS_NetworkGetHostName */ +} /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetID * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -100,5 +94,4 @@ int32 OS_NetworkGetID(void) } return IdBuf; - -} /* end OS_NetworkGetID */ +} diff --git a/src/os/shared/src/osapi-printf.c b/src/os/shared/src/osapi-printf.c index 81f8fc57c..030a5e9c2 100644 --- a/src/os/shared/src/osapi-printf.c +++ b/src/os/shared/src/osapi-printf.c @@ -77,8 +77,6 @@ OS_console_internal_record_t OS_console_table[OS_MAX_CONSOLES]; */ /*---------------------------------------------------------------- - * - * Function: OS_ConsoleAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -121,7 +119,7 @@ int32 OS_ConsoleAPI_Init(void) } return return_code; -} /* end OS_ConsoleAPI_Init */ +} /* ********************************************************************************* @@ -130,8 +128,6 @@ int32 OS_ConsoleAPI_Init(void) */ /*---------------------------------------------------------------- - * - * Function: OS_Console_CopyOut * * Purpose: Local helper routine, not part of OSAL API. * Write into the console ring buffer @@ -181,7 +177,7 @@ static int32 OS_Console_CopyOut(OS_console_internal_record_t *console, const cha } return return_code; -} /* end OS_Console_CopyOut */ +} /* ********************************************************************************* @@ -190,8 +186,6 @@ static int32 OS_Console_CopyOut(OS_console_internal_record_t *console, const cha */ /*---------------------------------------------------------------- - * - * Function: OS_ConsoleWrite * * Purpose: Local helper routine, not part of OSAL API. * Write into the console ring buffer @@ -258,11 +252,9 @@ int32 OS_ConsoleWrite(osal_id_t console_id, const char *Str) } return return_code; -} /* end OS_ConsoleWrite */ +} /*---------------------------------------------------------------- - * - * Function: OS_printf * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -319,12 +311,9 @@ void OS_printf(const char *String, ...) OS_ConsoleWrite(OS_SharedGlobalVars.PrintfConsoleId, msg_buffer); } - -} /* end OS_printf */ +} /*---------------------------------------------------------------- - * - * Function: OS_printf_disable * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -333,11 +322,9 @@ void OS_printf(const char *String, ...) void OS_printf_disable(void) { OS_SharedGlobalVars.PrintfEnabled = false; -} /* end OS_printf_disable */ +} /*---------------------------------------------------------------- - * - * Function: OS_printf_enable * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -346,4 +333,4 @@ void OS_printf_disable(void) void OS_printf_enable(void) { OS_SharedGlobalVars.PrintfEnabled = true; -} /* end OS_printf_enable */ +} diff --git a/src/os/shared/src/osapi-queue.c b/src/os/shared/src/osapi-queue.c index b7ac794c7..26724744c 100644 --- a/src/os/shared/src/osapi-queue.c +++ b/src/os/shared/src/osapi-queue.c @@ -64,8 +64,6 @@ OS_queue_internal_record_t OS_queue_table[LOCAL_NUM_OBJECTS]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_QueueAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -75,11 +73,9 @@ int32 OS_QueueAPI_Init(void) { memset(OS_queue_table, 0, sizeof(OS_queue_table)); return OS_SUCCESS; -} /* end OS_QueueAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -118,12 +114,9 @@ int32 OS_QueueCreate(osal_id_t *queue_id, const char *queue_name, osal_blockcoun } return return_code; - -} /* end OS_QueueCreate */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueDelete * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -144,12 +137,9 @@ int32 OS_QueueDelete(osal_id_t queue_id) } return return_code; - -} /* end OS_QueueDelete */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueGet * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -186,11 +176,9 @@ int32 OS_QueueGet(osal_id_t queue_id, void *data, size_t size, size_t *size_copi } return return_code; -} /* end OS_QueueGet */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueuePut * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -225,11 +213,9 @@ int32 OS_QueuePut(osal_id_t queue_id, const void *data, size_t size, uint32 flag } return return_code; -} /* end OS_QueuePut */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -246,12 +232,9 @@ int32 OS_QueueGetIdByName(osal_id_t *queue_id, const char *queue_name) return_code = OS_ObjectIdFindByName(LOCAL_OBJID_TYPE, queue_name, queue_id); return return_code; - -} /* end OS_QueueGetIdByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -285,5 +268,4 @@ int32 OS_QueueGetInfo(osal_id_t queue_id, OS_queue_prop_t *queue_prop) } return return_code; - -} /* end OS_QueueGetInfo */ +} diff --git a/src/os/shared/src/osapi-select.c b/src/os/shared/src/osapi-select.c index bf7ea91c2..21778cfb1 100644 --- a/src/os/shared/src/osapi-select.c +++ b/src/os/shared/src/osapi-select.c @@ -49,8 +49,6 @@ */ /*---------------------------------------------------------------- - * - * Function: OS_SelectSingle * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -73,11 +71,9 @@ int32 OS_SelectSingle(osal_id_t objid, uint32 *StateFlags, int32 msecs) } return return_code; -} /* end OS_SelectSingle */ +} /*---------------------------------------------------------------- - * - * Function: OS_SelectMultiple * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -101,11 +97,9 @@ int32 OS_SelectMultiple(OS_FdSet *ReadSet, OS_FdSet *WriteSet, int32 msecs) return_code = OS_SelectMultiple_Impl(ReadSet, WriteSet, msecs); return return_code; -} /* end OS_SelectMultiple */ +} /*---------------------------------------------------------------- - * - * Function: OS_SelectFdZero * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -118,11 +112,9 @@ int32 OS_SelectFdZero(OS_FdSet *Set) memset(Set, 0, sizeof(OS_FdSet)); return OS_SUCCESS; -} /* end OS_SelectFdZero */ +} /*---------------------------------------------------------------- - * - * Function: OS_SelectFdAdd * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -148,11 +140,9 @@ int32 OS_SelectFdAdd(OS_FdSet *Set, osal_id_t objid) } return return_code; -} /* end OS_SelectFdAdd */ +} /*---------------------------------------------------------------- - * - * Function: OS_SelectFdClear * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -178,11 +168,9 @@ int32 OS_SelectFdClear(OS_FdSet *Set, osal_id_t objid) } return return_code; -} /* end OS_SelectFdClear */ +} /*---------------------------------------------------------------- - * - * Function: OS_SelectFdIsSet * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -208,4 +196,4 @@ bool OS_SelectFdIsSet(const OS_FdSet *Set, osal_id_t objid) * and the mask/shift checks the bit within that element. */ return ((Set->object_ids[local_id >> 3] >> (local_id & 0x7)) & 0x1); -} /* end OS_SelectFdIsSet */ +} diff --git a/src/os/shared/src/osapi-shell.c b/src/os/shared/src/osapi-shell.c index 266287b93..f8ecc3118 100644 --- a/src/os/shared/src/osapi-shell.c +++ b/src/os/shared/src/osapi-shell.c @@ -41,8 +41,6 @@ #include "os-shared-idmap.h" /*---------------------------------------------------------------- - * - * Function: OS_ShellOutputToFile * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -64,4 +62,4 @@ int32 OS_ShellOutputToFile(const char *Cmd, osal_id_t filedes) } return return_code; -} /* end OS_ShellOutputToFile */ +} diff --git a/src/os/shared/src/osapi-sockets.c b/src/os/shared/src/osapi-sockets.c index a3c77f836..d15703820 100644 --- a/src/os/shared/src/osapi-sockets.c +++ b/src/os/shared/src/osapi-sockets.c @@ -61,8 +61,6 @@ enum ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_SocketAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -75,15 +73,13 @@ int32 OS_SocketAPI_Init(void) * cases where OS_INCLUDE_NETWORK is off */ return OS_SUCCESS; -} /* end OS_SocketAPI_Init */ +} /**************************************************************************************** Local Helper Functions ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_CreateSocketName * * Purpose: Local helper routine, not part of OSAL API. * @@ -112,11 +108,9 @@ void OS_CreateSocketName(const OS_object_token_t *token, const OS_SockAddr_t *Ad len = OS_strnlen(sock->stream_name, sizeof(sock->stream_name)); snprintf(&sock->stream_name[len], sizeof(sock->stream_name) - len, "-%s", parent_name); } -} /* end OS_CreateSocketName */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketOpen * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -150,11 +144,9 @@ int32 OS_SocketOpen(osal_id_t *sock_id, OS_SocketDomain_t Domain, OS_SocketType_ } return return_code; -} /* end OS_SocketOpen */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketBind * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -202,12 +194,9 @@ int32 OS_SocketBind(osal_id_t sock_id, const OS_SockAddr_t *Addr) } return return_code; - -} /* end OS_SocketBind */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAccept * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -292,11 +281,9 @@ int32 OS_SocketAccept(osal_id_t sock_id, osal_id_t *connsock_id, OS_SockAddr_t * } return return_code; -} /* end OS_SocketAccept */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketConnect * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -339,11 +326,9 @@ int32 OS_SocketConnect(osal_id_t sock_id, const OS_SockAddr_t *Addr, int32 Timeo } return return_code; -} /* end OS_SocketConnect */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketShutdown * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -395,11 +380,9 @@ int32 OS_SocketShutdown(osal_id_t sock_id, OS_SocketShutdownMode_t Mode) } return return_code; -} /* end OS_SocketShutdown */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketRecvFrom * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -442,11 +425,9 @@ int32 OS_SocketRecvFrom(osal_id_t sock_id, void *buffer, size_t buflen, OS_SockA } return return_code; -} /* end OS_SocketRecvFrom */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketSendTo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -481,11 +462,9 @@ int32 OS_SocketSendTo(osal_id_t sock_id, const void *buffer, size_t buflen, cons } return return_code; -} /* end OS_SocketSendTo */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -502,11 +481,9 @@ int32 OS_SocketGetIdByName(osal_id_t *sock_id, const char *sock_name) return_code = OS_ObjectIdFindByName(LOCAL_OBJID_TYPE, sock_name, sock_id); return return_code; -} /* end OS_SocketGetIdByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -537,11 +514,9 @@ int32 OS_SocketGetInfo(osal_id_t sock_id, OS_socket_prop_t *sock_prop) } return return_code; -} /* end OS_SocketGetInfo */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrInit * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -553,11 +528,9 @@ int32 OS_SocketAddrInit(OS_SockAddr_t *Addr, OS_SocketDomain_t Domain) OS_CHECK_POINTER(Addr); return OS_SocketAddrInit_Impl(Addr, Domain); -} /* end OS_SocketAddrInit */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrToString * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -571,11 +544,9 @@ int32 OS_SocketAddrToString(char *buffer, size_t buflen, const OS_SockAddr_t *Ad OS_CHECK_SIZE(buflen); return OS_SocketAddrToString_Impl(buffer, buflen, Addr); -} /* end OS_SocketAddrToString */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrFromString * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -588,11 +559,9 @@ int32 OS_SocketAddrFromString(OS_SockAddr_t *Addr, const char *string) OS_CHECK_POINTER(string); return OS_SocketAddrFromString_Impl(Addr, string); -} /* end OS_SocketAddrFromString */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrGetPort * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -605,11 +574,9 @@ int32 OS_SocketAddrGetPort(uint16 *PortNum, const OS_SockAddr_t *Addr) OS_CHECK_POINTER(PortNum); return OS_SocketAddrGetPort_Impl(PortNum, Addr); -} /* end OS_SocketAddrGetPort */ +} /*---------------------------------------------------------------- - * - * Function: OS_SocketAddrSetPort * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -621,4 +588,4 @@ int32 OS_SocketAddrSetPort(OS_SockAddr_t *Addr, uint16 PortNum) OS_CHECK_POINTER(Addr); return OS_SocketAddrSetPort_Impl(Addr, PortNum); -} /* end OS_SocketAddrSetPort */ +} diff --git a/src/os/shared/src/osapi-task.c b/src/os/shared/src/osapi-task.c index 52a60c42d..dc3705e0f 100644 --- a/src/os/shared/src/osapi-task.c +++ b/src/os/shared/src/osapi-task.c @@ -62,8 +62,6 @@ enum OS_task_internal_record_t OS_task_table[LOCAL_NUM_OBJECTS]; /*---------------------------------------------------------------- - * - * Function: OS_TaskPrepare * * Purpose: Local helper routine, not part of OSAL API. * Helper function for registering new tasks in the global database. @@ -111,11 +109,9 @@ static int32 OS_TaskPrepare(osal_id_t task_id, osal_task_entry *entrypt) } return return_code; -} /* end OS_TaskPrepare */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskEntryPoint * * Purpose: Local helper routine, not part of OSAL API. * The entry point for all OSAL tasks @@ -139,7 +135,7 @@ void OS_TaskEntryPoint(osal_id_t task_id) /* If the function returns, treat as a normal exit and do the proper cleanup */ OS_TaskExit(); -} /* end OS_TaskEntryPoint */ +} /* ********************************************************************************* @@ -148,8 +144,6 @@ void OS_TaskEntryPoint(osal_id_t task_id) */ /*---------------------------------------------------------------- - * - * Function: OS_TaskAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -159,11 +153,9 @@ int32 OS_TaskAPI_Init(void) { memset(OS_task_table, 0, sizeof(OS_task_table)); return OS_SUCCESS; -} /* end OS_TaskAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -208,11 +200,9 @@ int32 OS_TaskCreate(osal_id_t *task_id, const char *task_name, osal_task_entry f } return return_code; -} /* end OS_TaskCreate */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDelete * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -249,11 +239,9 @@ int32 OS_TaskDelete(osal_id_t task_id) } return return_code; -} /* end OS_TaskDelete */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskExit * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -277,11 +265,9 @@ void OS_TaskExit() OS_TaskExit_Impl(); /* Impl function never returns */ -} /* end OS_TaskExit */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDelay * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -291,11 +277,9 @@ int32 OS_TaskDelay(uint32 millisecond) { /* just call the implementation */ return OS_TaskDelay_Impl(millisecond); -} /* end OS_TaskDelay */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskSetPriority * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -325,11 +309,9 @@ int32 OS_TaskSetPriority(osal_id_t task_id, osal_priority_t new_priority) } return return_code; -} /* end OS_TaskSetPriority */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetId * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -342,11 +324,9 @@ osal_id_t OS_TaskGetId(void) task_id = OS_TaskGetId_Impl(); return task_id; -} /* end OS_TaskGetId */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -363,12 +343,9 @@ int32 OS_TaskGetIdByName(osal_id_t *task_id, const char *task_name) return_code = OS_ObjectIdFindByName(LOCAL_OBJID_TYPE, task_name, task_id); return return_code; - -} /* end OS_TaskGetIdByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -407,12 +384,9 @@ int32 OS_TaskGetInfo(osal_id_t task_id, OS_task_prop_t *task_prop) } return return_code; - -} /* end OS_TaskGetInfo */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskInstallDeleteHandler * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -440,11 +414,9 @@ int32 OS_TaskInstallDeleteHandler(osal_task_entry function_pointer) } return return_code; -} /* end OS_TaskInstallDeleteHandler */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskFindIdBySystemData * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -475,4 +447,4 @@ int32 OS_TaskFindIdBySystemData(osal_id_t *task_id, const void *sysdata, size_t } return return_code; -} /* end OS_TaskFindIdBySystemData */ +} diff --git a/src/os/shared/src/osapi-time.c b/src/os/shared/src/osapi-time.c index daba5bb0e..c9dd57bf0 100644 --- a/src/os/shared/src/osapi-time.c +++ b/src/os/shared/src/osapi-time.c @@ -65,8 +65,6 @@ typedef union ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_TimerCbAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -76,11 +74,9 @@ int32 OS_TimerCbAPI_Init(void) { memset(OS_timecb_table, 0, sizeof(OS_timecb_table)); return OS_SUCCESS; -} /* end OS_TimerCbAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_DoTimerAdd * * Purpose: Local helper routine, not part of OSAL API. * Adds new OSAL Timer based on an existing timebase @@ -193,11 +189,9 @@ static int32 OS_DoTimerAdd(osal_id_t *timer_id, const char *timer_name, osal_id_ } return return_code; -} /* end OS_DoTimerAdd */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimerAdd * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -207,11 +201,9 @@ int32 OS_TimerAdd(osal_id_t *timer_id, const char *timer_name, osal_id_t timebas void *callback_arg) { return (OS_DoTimerAdd(timer_id, timer_name, timebase_ref_id, callback_ptr, callback_arg, 0)); -} /* end OS_TimerAdd */ +} /*---------------------------------------------------------------- - * - * Function: OS_Timer_NoArgCallback * * Purpose: Local helper routine, not part of OSAL API. * @@ -226,11 +218,9 @@ static void OS_Timer_NoArgCallback(osal_id_t objid, void *arg) */ Conv.opaque_arg = arg; (*Conv.timer_callback_func)(objid); -} /* end OS_Timer_NoArgCallback */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimerCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -291,11 +281,9 @@ int32 OS_TimerCreate(osal_id_t *timer_id, const char *timer_name, uint32 *accura } return return_code; -} /* end OS_TimerCreate */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimerSet * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -363,11 +351,9 @@ int32 OS_TimerSet(osal_id_t timer_id, uint32 start_time, uint32 interval_time) return_code = OS_TimeBaseSet(dedicated_timebase_id, start_time, interval_time); } return return_code; -} /* end OS_TimerSet */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimerDelete * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -467,11 +453,9 @@ int32 OS_TimerDelete(osal_id_t timer_id) } return return_code; -} /* end OS_TimerDelete */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimerGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -499,11 +483,9 @@ int32 OS_TimerGetIdByName(osal_id_t *timer_id, const char *timer_name) return_code = OS_ObjectIdFindByName(OS_OBJECT_TYPE_OS_TIMECB, timer_name, timer_id); return return_code; -} /* end OS_TimerGetIdByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimerGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -549,4 +531,4 @@ int32 OS_TimerGetInfo(osal_id_t timer_id, OS_timer_prop_t *timer_prop) } return return_code; -} /* end OS_TimerGetInfo */ +} diff --git a/src/os/shared/src/osapi-timebase.c b/src/os/shared/src/osapi-timebase.c index 89a5ca953..810cb61c9 100644 --- a/src/os/shared/src/osapi-timebase.c +++ b/src/os/shared/src/osapi-timebase.c @@ -73,8 +73,6 @@ OS_timebase_internal_record_t OS_timebase_table[OS_MAX_TIMEBASES]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseAPI_Init * * Purpose: Local helper routine, not part of OSAL API. * Init function for OS-independent layer @@ -84,11 +82,9 @@ int32 OS_TimeBaseAPI_Init(void) { memset(OS_timebase_table, 0, sizeof(OS_timebase_table)); return OS_SUCCESS; -} /* end OS_TimeBaseAPI_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseCreate * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -149,11 +145,9 @@ int32 OS_TimeBaseCreate(osal_id_t *timer_id, const char *timebase_name, OS_Timer } return return_code; -} /* end OS_TimeBaseCreate */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseSet * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -210,11 +204,9 @@ int32 OS_TimeBaseSet(osal_id_t timer_id, uint32 start_time, uint32 interval_time } return return_code; -} /* end OS_TimeBaseSet */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseDelete * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -246,11 +238,9 @@ int32 OS_TimeBaseDelete(osal_id_t timer_id) } return return_code; -} /* end OS_TimeBaseDelete */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseGetIdByName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -278,11 +268,9 @@ int32 OS_TimeBaseGetIdByName(osal_id_t *timer_id, const char *timebase_name) return_code = OS_ObjectIdFindByName(OS_OBJECT_TYPE_OS_TIMEBASE, timebase_name, timer_id); return return_code; -} /* end OS_TimeBaseGetIdByName */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseGetInfo * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -329,11 +317,9 @@ int32 OS_TimeBaseGetInfo(osal_id_t timebase_id, OS_timebase_prop_t *timebase_pro } return return_code; -} /* end OS_TimeBaseGetInfo */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseGetFreeRun * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -357,11 +343,9 @@ int32 OS_TimeBaseGetFreeRun(osal_id_t timebase_id, uint32 *freerun_val) } return return_code; -} /* end OS_TimeBaseGetFreeRun */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBase_CallbackThread * * Purpose: Local helper routine, not part of OSAL API. * Implementation of the time base "helper thread" @@ -523,11 +507,9 @@ void OS_TimeBase_CallbackThread(osal_id_t timebase_id) OS_TimeBaseUnlock_Impl(&token); } -} /* end OS_TimeBase_CallbackThread */ +} /*---------------------------------------------------------------- - * - * Function: OS_Milli2Ticks * * Purpose: Internal helper to convert milliseconds to ticks * @@ -553,4 +535,4 @@ int32 OS_Milli2Ticks(uint32 milli_seconds, int *ticks) } return return_code; -} /* end OS_Milli2Ticks */ +} diff --git a/src/os/shared/src/osapi-version.c b/src/os/shared/src/osapi-version.c index 705ae2434..595cb2348 100644 --- a/src/os/shared/src/osapi-version.c +++ b/src/os/shared/src/osapi-version.c @@ -30,8 +30,6 @@ #include "osapi-version.h" /*---------------------------------------------------------------- - * - * Function: OS_GetVersionString * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -43,8 +41,6 @@ const char *OS_GetVersionString(void) } /*---------------------------------------------------------------- - * - * Function: OS_GetVersionCodeName * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -56,8 +52,6 @@ const char *OS_GetVersionCodeName(void) } /*---------------------------------------------------------------- - * - * Function: OS_GetVersionNumber * * Purpose: Implemented per public OSAL API * See description in API and header file for detail @@ -72,8 +66,6 @@ void OS_GetVersionNumber(uint8 VersionNumbers[4]) } /*---------------------------------------------------------------- - * - * Function: OS_GetBuildNumber * * Purpose: Implemented per public OSAL API * See description in API and header file for detail diff --git a/src/os/vxworks/src/os-impl-binsem.c b/src/os/vxworks/src/os-impl-binsem.c index 57b321717..28f0b9bc3 100644 --- a/src/os/vxworks/src/os-impl-binsem.c +++ b/src/os/vxworks/src/os-impl-binsem.c @@ -49,8 +49,6 @@ OS_impl_binsem_internal_record_t OS_impl_bin_sem_table[OS_MAX_BIN_SEMAPHORES]; ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_BinSemAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -59,11 +57,9 @@ int32 OS_VxWorks_BinSemAPI_Impl_Init(void) { memset(OS_impl_bin_sem_table, 0, sizeof(OS_impl_bin_sem_table)); return OS_SUCCESS; -} /* end OS_VxWorks_BinSemAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -89,12 +85,9 @@ int32 OS_BinSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_va impl->vxid = tmp_sem_id; return OS_SUCCESS; - -} /* end OS_BinSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -111,12 +104,9 @@ int32 OS_BinSemDelete_Impl(const OS_object_token_t *token) */ impl->vxid = 0; return OS_SUCCESS; - -} /* end OS_BinSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -130,11 +120,9 @@ int32 OS_BinSemGive_Impl(const OS_object_token_t *token) /* Use common routine */ return OS_VxWorks_GenericSemGive(impl->vxid); -} /* end OS_BinSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemFlush_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -154,11 +142,9 @@ int32 OS_BinSemFlush_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_BinSemFlush_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -172,12 +158,9 @@ int32 OS_BinSemTake_Impl(const OS_object_token_t *token) /* Use common routine */ return OS_VxWorks_GenericSemTake(impl->vxid, WAIT_FOREVER); - -} /* end OS_BinSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemTimedWait_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -199,11 +182,9 @@ int32 OS_BinSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs) } return status; -} /* end OS_BinSemTimedWait_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_BinSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -213,4 +194,4 @@ int32 OS_BinSemGetInfo_Impl(const OS_object_token_t *token, OS_bin_sem_prop_t *b { /* VxWorks has no API for obtaining the current value of a semaphore */ return OS_SUCCESS; -} /* end OS_BinSemGetInfo_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-common.c b/src/os/vxworks/src/os-impl-common.c index 8e95f9228..78f6e103e 100644 --- a/src/os/vxworks/src/os-impl-common.c +++ b/src/os/vxworks/src/os-impl-common.c @@ -52,8 +52,6 @@ static TASK_ID OS_idle_task_id; ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_API_Impl_Init * * Purpose: Initialize the tables that the OS API uses to keep track of information * about objects @@ -103,11 +101,9 @@ int32 OS_API_Impl_Init(osal_objtype_t idtype) } return return_code; -} /* end OS_API_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_IdleLoop_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -118,11 +114,9 @@ void OS_IdleLoop_Impl(void) TASK_ID tid = taskIdSelf(); OS_idle_task_id = tid; taskSuspend(tid); -} /* end OS_IdleLoop_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ApplicationShutdown_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -131,7 +125,7 @@ void OS_IdleLoop_Impl(void) void OS_ApplicationShutdown_Impl(void) { taskResume(OS_idle_task_id); -} /* end OS_ApplicationShutdown_Impl */ +} /**************************************************************************************** GENERIC SEMAPHORE API @@ -147,8 +141,6 @@ void OS_ApplicationShutdown_Impl(void) */ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_GenericSemGive * * Purpose: Local helper routine, not part of OSAL API. * @@ -162,11 +154,9 @@ int32 OS_VxWorks_GenericSemGive(SEM_ID vxid) return OS_SEM_FAILURE; } return OS_SUCCESS; -} /* end OS_VxWorks_GenericSemGive */ +} /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_GenericSemTake * * Purpose: Local helper routine, not part of OSAL API. * @@ -197,4 +187,4 @@ int32 OS_VxWorks_GenericSemTake(SEM_ID vxid, int sys_ticks) } return OS_SUCCESS; -} /* end OS_VxWorks_GenericSemTake */ +} diff --git a/src/os/vxworks/src/os-impl-console.c b/src/os/vxworks/src/os-impl-console.c index 71ff0db3f..c4cecc4d9 100644 --- a/src/os/vxworks/src/os-impl-console.c +++ b/src/os/vxworks/src/os-impl-console.c @@ -59,8 +59,6 @@ OS_impl_console_internal_record_t OS_impl_console_table[OS_MAX_CONSOLES]; /********************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ConsoleWakeup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -77,12 +75,9 @@ void OS_ConsoleWakeup_Impl(const OS_object_token_t *token) { OS_DEBUG("semGive() - vxWorks errno %d\n", errno); } - -} /* end OS_ConsoleWakeup_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ConsoleTask_Entry * * Purpose: Local helper routine, not part of OSAL API. * @@ -112,11 +107,9 @@ int OS_VxWorks_ConsoleTask_Entry(int arg) /* Return OK since called from taskSpawn, error is reported in debug message */ return OK; -} /* end OS_ConsoleTask_Entry */ +} /*---------------------------------------------------------------- - * - * Function: OS_ConsoleCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -169,4 +162,4 @@ int32 OS_ConsoleCreate_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_ConsoleCreate_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-countsem.c b/src/os/vxworks/src/os-impl-countsem.c index 0fcb84599..260417a18 100644 --- a/src/os/vxworks/src/os-impl-countsem.c +++ b/src/os/vxworks/src/os-impl-countsem.c @@ -48,8 +48,6 @@ OS_impl_countsem_internal_record_t OS_impl_count_sem_table[OS_MAX_COUNT_SEMAPHOR ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_CountSemAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -58,11 +56,9 @@ int32 OS_VxWorks_CountSemAPI_Impl_Init(void) { memset(OS_impl_count_sem_table, 0, sizeof(OS_impl_count_sem_table)); return OS_SUCCESS; -} /* end OS_VxWorks_CountSemAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -88,12 +84,9 @@ int32 OS_CountSemCreate_Impl(const OS_object_token_t *token, uint32 sem_initial_ impl->vxid = tmp_sem_id; return OS_SUCCESS; - -} /* end OS_CountSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -110,12 +103,9 @@ int32 OS_CountSemDelete_Impl(const OS_object_token_t *token) */ impl->vxid = 0; return OS_SUCCESS; - -} /* end OS_CountSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -129,11 +119,9 @@ int32 OS_CountSemGive_Impl(const OS_object_token_t *token) /* Give VxWorks Semaphore */ return OS_VxWorks_GenericSemGive(impl->vxid); -} /* end OS_CountSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -146,11 +134,9 @@ int32 OS_CountSemTake_Impl(const OS_object_token_t *token) impl = OS_OBJECT_TABLE_GET(OS_impl_count_sem_table, *token); return OS_VxWorks_GenericSemTake(impl->vxid, WAIT_FOREVER); -} /* end OS_CountSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemTimedWait_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -172,11 +158,9 @@ int32 OS_CountSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs) } return status; -} /* end OS_CountSemTimedWait_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_CountSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -186,5 +170,4 @@ int32 OS_CountSemGetInfo_Impl(const OS_object_token_t *token, OS_count_sem_prop_ { /* VxWorks does not provide an API to get the value */ return OS_SUCCESS; - -} /* end OS_CountSemGetInfo_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-dirs-globals.c b/src/os/vxworks/src/os-impl-dirs-globals.c index 28ebf9886..8795192a0 100644 --- a/src/os/vxworks/src/os-impl-dirs-globals.c +++ b/src/os/vxworks/src/os-impl-dirs-globals.c @@ -37,8 +37,6 @@ OS_impl_dir_internal_record_t OS_impl_dir_table[OS_MAX_NUM_OPEN_DIRS]; /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_DirAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -47,4 +45,4 @@ int32 OS_VxWorks_DirAPI_Impl_Init(void) { memset(OS_impl_dir_table, 0, sizeof(OS_impl_dir_table)); return OS_SUCCESS; -} /* end OS_VxWorks_DirAPI_Impl_Init */ +} diff --git a/src/os/vxworks/src/os-impl-files.c b/src/os/vxworks/src/os-impl-files.c index 26b0a1398..9c626ff1a 100644 --- a/src/os/vxworks/src/os-impl-files.c +++ b/src/os/vxworks/src/os-impl-files.c @@ -39,8 +39,6 @@ OS_impl_file_internal_record_t OS_impl_filehandle_table[OS_MAX_NUM_OPEN_FILES]; /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_StreamAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -60,4 +58,4 @@ int32 OS_VxWorks_StreamAPI_Impl_Init(void) } return OS_SUCCESS; -} /* end OS_VxWorks_StreamAPI_Impl_Init */ +} diff --git a/src/os/vxworks/src/os-impl-filesys.c b/src/os/vxworks/src/os-impl-filesys.c index ee22c5c46..2bdb9c40d 100644 --- a/src/os/vxworks/src/os-impl-filesys.c +++ b/src/os/vxworks/src/os-impl-filesys.c @@ -68,8 +68,6 @@ OS_impl_filesys_internal_record_t OS_impl_filesys_table[OS_MAX_FILE_SYSTEMS]; ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_FileSysStartVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -183,12 +181,9 @@ int32 OS_FileSysStartVolume_Impl(const OS_object_token_t *token) } return return_code; - -} /* end OS_FileSysStartVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysStopVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -225,12 +220,9 @@ int32 OS_FileSysStopVolume_Impl(const OS_object_token_t *token) */ return OS_SUCCESS; - -} /* end OS_FileSysStopVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysFormatVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -278,12 +270,9 @@ int32 OS_FileSysFormatVolume_Impl(const OS_object_token_t *token) } return return_code; - -} /* end OS_FileSysFormatVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysMountVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -353,12 +342,9 @@ int32 OS_FileSysMountVolume_Impl(const OS_object_token_t *token) } return status; - -} /* end OS_FileSysMountVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysUnmountVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -403,12 +389,9 @@ int32 OS_FileSysUnmountVolume_Impl(const OS_object_token_t *token) } return status; - -} /* end OS_FileSysUnmountVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysStatVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -436,12 +419,9 @@ int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *re } return return_code; - -} /* end OS_FileSysStatVolume_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_FileSysCheckVolume_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -484,5 +464,4 @@ int32 OS_FileSysCheckVolume_Impl(const OS_object_token_t *token, bool repair) } return OS_SUCCESS; - -} /* end OS_FileSysCheckVolume_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-heap.c b/src/os/vxworks/src/os-impl-heap.c index 58af94109..f55ae0a3a 100644 --- a/src/os/vxworks/src/os-impl-heap.c +++ b/src/os/vxworks/src/os-impl-heap.c @@ -36,8 +36,6 @@ ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_HeapGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -60,4 +58,4 @@ int32 OS_HeapGetInfo_Impl(OS_heap_prop_t *heap_prop) heap_prop->largest_free_block = OSAL_SIZE_C(stats.maxBlockSizeFree); return OS_SUCCESS; -} /* end OS_HeapGetInfo_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-idmap.c b/src/os/vxworks/src/os-impl-idmap.c index 532406dc8..7f9650081 100644 --- a/src/os/vxworks/src/os-impl-idmap.c +++ b/src/os/vxworks/src/os-impl-idmap.c @@ -87,8 +87,6 @@ OS_impl_objtype_lock_t *const OS_impl_objtype_lock_table[OS_OBJECT_TYPE_USER] = [OS_OBJECT_TYPE_OS_CONSOLE] = &OS_console_table_lock}; /*---------------------------------------------------------------- - * - * Function: OS_Lock_Global_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -104,12 +102,9 @@ void OS_Lock_Global_Impl(osal_objtype_t idtype) { OS_DEBUG("semTake() - vxWorks errno %d\n", errno); } - -} /* end OS_Lock_Global_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_Unlock_Global_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -125,12 +120,9 @@ void OS_Unlock_Global_Impl(osal_objtype_t idtype) { OS_DEBUG("semGive() - vxWorks errno %d\n", errno); } - -} /* end OS_Unlock_Global_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_WaitForStateChange_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -159,8 +151,6 @@ void OS_WaitForStateChange_Impl(osal_objtype_t idtype, uint32 attempts) ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_TableMutex_Init * * Purpose: Initialize the tables that the OS API uses to keep track of information * about objects @@ -189,5 +179,4 @@ int32 OS_VxWorks_TableMutex_Init(osal_objtype_t idtype) impl->vxid = semid; return OS_SUCCESS; - -} /* end OS_VxWorks_TableMutex_Init */ +} diff --git a/src/os/vxworks/src/os-impl-loader.c b/src/os/vxworks/src/os-impl-loader.c index b5addaf4b..b1954e0e6 100644 --- a/src/os/vxworks/src/os-impl-loader.c +++ b/src/os/vxworks/src/os-impl-loader.c @@ -46,8 +46,6 @@ OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES]; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_ModuleAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -56,15 +54,13 @@ int32 OS_VxWorks_ModuleAPI_Impl_Init(void) { memset(&OS_impl_module_table, 0, sizeof(OS_impl_module_table)); return OS_SUCCESS; -} /* end OS_VxWorks_ModuleAPI_Impl_Init */ +} /**************************************************************************************** Module Loader API ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_ModuleLoad_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -117,12 +113,9 @@ int32 OS_ModuleLoad_Impl(const OS_object_token_t *token, const char *translated_ } return return_code; - -} /* end OS_ModuleLoad_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleUnload_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -146,12 +139,9 @@ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token) } return OS_SUCCESS; - -} /* end OS_ModuleUnload_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -191,5 +181,4 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo } return return_code; - -} /* end OS_ModuleGetInfo_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-mutex.c b/src/os/vxworks/src/os-impl-mutex.c index 0dd26fa9e..48862739d 100644 --- a/src/os/vxworks/src/os-impl-mutex.c +++ b/src/os/vxworks/src/os-impl-mutex.c @@ -46,8 +46,6 @@ OS_impl_mutsem_internal_record_t OS_impl_mutex_table[OS_MAX_MUTEXES]; ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_MutexAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -56,11 +54,9 @@ int32 OS_VxWorks_MutexAPI_Impl_Init(void) { memset(OS_impl_mutex_table, 0, sizeof(OS_impl_mutex_table)); return OS_SUCCESS; -} /* end OS_VxWorks_MutexAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -85,11 +81,9 @@ int32 OS_MutSemCreate_Impl(const OS_object_token_t *token, uint32 options) impl->vxid = tmp_sem_id; return OS_SUCCESS; -} /* end OS_MutSemCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -106,12 +100,9 @@ int32 OS_MutSemDelete_Impl(const OS_object_token_t *token) */ impl->vxid = 0; return OS_SUCCESS; - -} /* end OS_MutSemDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGive_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -125,11 +116,9 @@ int32 OS_MutSemGive_Impl(const OS_object_token_t *token) /* Give VxWorks Semaphore */ return OS_VxWorks_GenericSemGive(impl->vxid); -} /* end OS_MutSemGive_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemTake_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -143,11 +132,9 @@ int32 OS_MutSemTake_Impl(const OS_object_token_t *token) /* Take VxWorks Semaphore */ return OS_VxWorks_GenericSemTake(impl->vxid, WAIT_FOREVER); -} /* end OS_MutSemTake_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_MutSemGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -157,5 +144,4 @@ int32 OS_MutSemGetInfo_Impl(const OS_object_token_t *token, OS_mut_sem_prop_t *m { /* VxWorks provides no additional info */ return OS_SUCCESS; - -} /* end OS_MutSemGetInfo_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-network.c b/src/os/vxworks/src/os-impl-network.c index 4412e1370..44e5ce93d 100644 --- a/src/os/vxworks/src/os-impl-network.c +++ b/src/os/vxworks/src/os-impl-network.c @@ -34,8 +34,6 @@ #define OS_HOST_NAME_LEN 48 /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetHostName_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -56,11 +54,9 @@ int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len) } return return_code; -} /* end OS_NetworkGetHostName_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetID_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -87,5 +83,4 @@ int32 OS_NetworkGetID_Impl(int32 *IdBuf) } return status; - -} /* end OS_NetworkGetID_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-no-module.c b/src/os/vxworks/src/os-impl-no-module.c index 2cc9e2633..73b0337a3 100644 --- a/src/os/vxworks/src/os-impl-no-module.c +++ b/src/os/vxworks/src/os-impl-no-module.c @@ -34,8 +34,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_ModuleAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -44,4 +42,4 @@ int32 OS_VxWorks_ModuleAPI_Impl_Init(void) { /* nothing to init, but needs to return SUCCESS to allow the rest of OSAL to work */ return OS_SUCCESS; -} /* end OS_VxWorks_ModuleAPI_Impl_Init */ +} diff --git a/src/os/vxworks/src/os-impl-queues.c b/src/os/vxworks/src/os-impl-queues.c index 54345e30a..4ef34ea43 100644 --- a/src/os/vxworks/src/os-impl-queues.c +++ b/src/os/vxworks/src/os-impl-queues.c @@ -42,8 +42,6 @@ OS_impl_queue_internal_record_t OS_impl_queue_table[OS_MAX_QUEUES]; ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_QueueAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -52,11 +50,9 @@ int32 OS_VxWorks_QueueAPI_Impl_Init(void) { memset(OS_impl_queue_table, 0, sizeof(OS_impl_queue_table)); return OS_SUCCESS; -} /* end OS_VxWorks_QueueAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -88,12 +84,9 @@ int32 OS_QueueCreate_Impl(const OS_object_token_t *token, uint32 flags) impl->vxid = tmp_msgq_id; return OS_SUCCESS; - -} /* end OS_QueueCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -114,12 +107,9 @@ int32 OS_QueueDelete_Impl(const OS_object_token_t *token) impl->vxid = 0; return OS_SUCCESS; - -} /* end OS_QueueDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueGet_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -178,11 +168,9 @@ int32 OS_QueueGet_Impl(const OS_object_token_t *token, void *data, size_t size, } return return_code; -} /* end OS_QueueGet_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueuePut_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -210,12 +198,9 @@ int32 OS_QueuePut_Impl(const OS_object_token_t *token, const void *data, size_t } return return_code; - -} /* end OS_QueuePut_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_QueueGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -225,5 +210,4 @@ int32 OS_QueueGetInfo_Impl(const OS_object_token_t *token, OS_queue_prop_t *queu { /* No extra info for queues in the OS implementation */ return OS_SUCCESS; - -} /* end OS_QueueGetInfo_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-shell.c b/src/os/vxworks/src/os-impl-shell.c index ca8e55117..c5094379a 100644 --- a/src/os/vxworks/src/os-impl-shell.c +++ b/src/os/vxworks/src/os-impl-shell.c @@ -46,8 +46,6 @@ #define OS_SHELL_CMD_TASK_PRIORITY 250 /*---------------------------------------------------------------- - * - * Function: OS_ShellOutputToFile_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -103,5 +101,4 @@ int32 OS_ShellOutputToFile_Impl(const OS_object_token_t *token, const char *Cmd) OS_close(fdCmd); return ReturnCode; - -} /* end OS_ShellOutputToFile_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-sockets.c b/src/os/vxworks/src/os-impl-sockets.c index f5099d44f..b45230c95 100644 --- a/src/os/vxworks/src/os-impl-sockets.c +++ b/src/os/vxworks/src/os-impl-sockets.c @@ -37,8 +37,6 @@ ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_ModuleAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * diff --git a/src/os/vxworks/src/os-impl-symtab.c b/src/os/vxworks/src/os-impl-symtab.c index 0ebc777ed..c3018fd48 100644 --- a/src/os/vxworks/src/os-impl-symtab.c +++ b/src/os/vxworks/src/os-impl-symtab.c @@ -61,8 +61,6 @@ extern SYMTAB_ID sysSymTbl; ***************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_GenericSymbolLookup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -101,12 +99,9 @@ int32 OS_GenericSymbolLookup_Impl(SYMTAB_ID SymTab, cpuaddr *SymbolAddress, cons } return OS_SUCCESS; - -} /* end OS_GenericSymbolLookup_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SymbolLookup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -115,11 +110,9 @@ int32 OS_GenericSymbolLookup_Impl(SYMTAB_ID SymTab, cpuaddr *SymbolAddress, cons int32 OS_SymbolLookup_Impl(cpuaddr *SymbolAddress, const char *SymbolName) { return OS_GenericSymbolLookup_Impl(sysSymTbl, SymbolAddress, SymbolName); -} /* end OS_SymbolLookup_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_ModuleSymbolLookup_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -135,11 +128,9 @@ int32 OS_ModuleSymbolLookup_Impl(const OS_object_token_t *token, cpuaddr *Symbol * offers this capability. */ return OS_GenericSymbolLookup_Impl(sysSymTbl, SymbolAddress, SymbolName); -} /* end OS_ModuleSymbolLookup_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SymTableIterator_Impl * * Purpose: Local helper routine, not part of OSAL API. * Function called by vxWorks to iterate the vxworks symbol table @@ -221,11 +212,9 @@ BOOL OS_SymTableIterator_Impl(char *name, SYM_VALUE val, SYM_TYPE type, _Vx_usr_ ** It's OK to continue */ return true; -} /* end OS_SymTableIterator_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_SymbolTableDump_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -274,5 +263,4 @@ int32 OS_SymbolTableDump_Impl(const char *filename, size_t size_limit) } return state->StatusCode; - -} /* end OS_SymbolTableDump_Impl */ +} diff --git a/src/os/vxworks/src/os-impl-tasks.c b/src/os/vxworks/src/os-impl-tasks.c index 0035bdcd8..9e5eef498 100644 --- a/src/os/vxworks/src/os-impl-tasks.c +++ b/src/os/vxworks/src/os-impl-tasks.c @@ -85,15 +85,13 @@ int OS_VxWorks_TaskEntry(int arg) OS_TaskEntryPoint(OS_ObjectIdFromInteger(arg)); return 0; -} /* end OS_VxWorksEntry */ +} /**************************************************************************************** TASK API ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_TaskAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -102,11 +100,9 @@ int32 OS_VxWorks_TaskAPI_Impl_Init(void) { memset(OS_impl_task_table, 0, sizeof(OS_impl_task_table)); return OS_SUCCESS; -} /* end OS_VxWorks_TaskAPI_Impl_Init */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -252,12 +248,9 @@ int32 OS_TaskCreate_Impl(const OS_object_token_t *token, uint32 flags) taskActivate(lrec->vxid); return OS_SUCCESS; - -} /* end OS_TaskCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -283,12 +276,9 @@ int32 OS_TaskDelete_Impl(const OS_object_token_t *token) impl->vxid = 0; return OS_SUCCESS; - -} /* end OS_TaskDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDetach_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -301,8 +291,6 @@ int32 OS_TaskDetach_Impl(const OS_object_token_t *token) } /*---------------------------------------------------------------- - * - * Function: OS_TaskExit_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -311,11 +299,9 @@ int32 OS_TaskDetach_Impl(const OS_object_token_t *token) void OS_TaskExit_Impl() { taskExit(0); -} /* end OS_TaskExit_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskDelay_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -338,12 +324,9 @@ int32 OS_TaskDelay_Impl(uint32 milli_second) return OS_ERROR; } return OS_SUCCESS; - -} /* end OS_TaskDelay_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskSetPriority_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -362,12 +345,9 @@ int32 OS_TaskSetPriority_Impl(const OS_object_token_t *token, osal_priority_t ne } return OS_SUCCESS; - -} /* end OS_TaskSetPriority_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskMatch_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -388,11 +368,9 @@ int32 OS_TaskMatch_Impl(const OS_object_token_t *token) } return OS_SUCCESS; -} /* end OS_TaskMatch_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskRegister_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -401,11 +379,9 @@ int32 OS_TaskMatch_Impl(const OS_object_token_t *token) int32 OS_TaskRegister_Impl(osal_id_t global_task_id) { return OS_SUCCESS; -} /* end OS_TaskRegister_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetId_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -430,12 +406,9 @@ osal_id_t OS_TaskGetId_Impl(void) } return id; - -} /* end OS_TaskGetId_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -444,12 +417,9 @@ osal_id_t OS_TaskGetId_Impl(void) int32 OS_TaskGetInfo_Impl(const OS_object_token_t *token, OS_task_prop_t *task_prop) { return OS_SUCCESS; - -} /* end OS_TaskGetInfo_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TaskValidateSystemData_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -465,8 +435,6 @@ int32 OS_TaskValidateSystemData_Impl(const void *sysdata, size_t sysdata_size) } /*---------------------------------------------------------------- - * - * Function: OS_TaskIdMatchSystemData_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail diff --git a/src/os/vxworks/src/os-impl-timebase.c b/src/os/vxworks/src/os-impl-timebase.c index 31b011f52..c3ff81204 100644 --- a/src/os/vxworks/src/os-impl-timebase.c +++ b/src/os/vxworks/src/os-impl-timebase.c @@ -86,8 +86,6 @@ static uint32 OS_ClockAccuracyNsec; ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseLock_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -100,11 +98,9 @@ void OS_TimeBaseLock_Impl(const OS_object_token_t *token) impl = OS_OBJECT_TABLE_GET(OS_impl_timebase_table, *token); semTake(impl->handler_mutex, WAIT_FOREVER); -} /* end OS_TimeBaseLock_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseUnlock_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -117,11 +113,9 @@ void OS_TimeBaseUnlock_Impl(const OS_object_token_t *token) impl = OS_OBJECT_TABLE_GET(OS_impl_timebase_table, *token); semGive(impl->handler_mutex); -} /* end OS_TimeBaseUnlock_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_Impl_UsecToTimespec * * Purpose: Local helper routine, not part of OSAL API. * @@ -138,11 +132,9 @@ void OS_VxWorks_UsecToTimespec(uint32 usecs, struct timespec *time_spec) time_spec->tv_sec = usecs / 1000000; time_spec->tv_nsec = (usecs % 1000000) * 1000; } -} /* end OS_Impl_UsecToTimespec */ +} /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_SigWait * * Purpose: Local helper routine, not part of OSAL API. * Blocks the calling task until the timer tick arrives @@ -201,11 +193,9 @@ uint32 OS_VxWorks_SigWait(osal_id_t timebase_id) } return tick_time; -} /* end OS_VxWorks_SigWait */ +} /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_RegisterTimer * * Purpose: Local helper routine, not part of OSAL API. * @@ -264,15 +254,13 @@ void OS_VxWorks_RegisterTimer(osal_id_t obj_id) { OS_DEBUG("OS_VxWorks_RegisterTimer() bad ID, code=%d\n", (int)retcode); } -} /* end OS_VxWorks_RegisterTimer */ +} /**************************************************************************************** Entry point for helper thread ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_TimeBaseTask * * Purpose: Local helper routine, not part of OSAL API. * @@ -286,15 +274,13 @@ int OS_VxWorks_TimeBaseTask(int arg) OS_TimeBase_CallbackThread(obj_id); return 0; -} /* end OS_VxWorks_TimeBaseTask */ +} /**************************************************************************************** INITIALIZATION FUNCTION ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_VxWorks_TimeBaseAPI_Impl_Init * * Purpose: Local helper routine, not part of OSAL API. * @@ -332,15 +318,13 @@ int32 OS_VxWorks_TimeBaseAPI_Impl_Init(void) OS_SharedGlobalVars.MicroSecPerTick = (OS_ClockAccuracyNsec + 500) / 1000; return OS_SUCCESS; -} /* end OS_VxWorks_TimeBaseAPI_Impl_Init */ +} /**************************************************************************************** Time Base API ****************************************************************************************/ /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseCreate_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -514,11 +498,9 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token) } return return_code; -} /* end OS_TimeBaseCreate_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseSet_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -609,11 +591,9 @@ int32 OS_TimeBaseSet_Impl(const OS_object_token_t *token, uint32 start_time, uin } return return_code; -} /* end OS_TimeBaseSet_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseDelete_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -643,11 +623,9 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token) local->handler_task = 0; return return_code; -} /* end OS_TimeBaseDelete_Impl */ +} /*---------------------------------------------------------------- - * - * Function: OS_TimeBaseGetInfo_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -656,5 +634,4 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token) int32 OS_TimeBaseGetInfo_Impl(const OS_object_token_t *token, OS_timebase_prop_t *timer_prop) { return OS_SUCCESS; - -} /* end OS_TimeBaseGetInfo_Impl */ +} diff --git a/src/tests/bin-sem-test/bin-sem-test.c b/src/tests/bin-sem-test/bin-sem-test.c index 2d2ec810b..c601dd9f6 100644 --- a/src/tests/bin-sem-test/bin-sem-test.c +++ b/src/tests/bin-sem-test/bin-sem-test.c @@ -114,7 +114,6 @@ void task_1(void) /* if failures occur, do not loop endlessly */ while (task_1_failures < 20) { - status = OS_BinSemTake(bin_sem_id); if (status != OS_SUCCESS) { diff --git a/src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c b/src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c index 3811e33cc..a05216b83 100644 --- a/src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c +++ b/src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c @@ -71,8 +71,7 @@ void TestFileSysAddFixedMapApi(void) /* create a path where only the "name" part is too long, but the overall path length is within limit */ translated_path[OS_MAX_LOCAL_PATH_LEN - 1] = 0; UtAssert_INT32_EQ(OS_FileSysAddFixedMap(&fs_id, translated_path, "/test"), OS_ERR_NAME_TOO_LONG); - -} /* end TestFileSysAddFixedMapApi */ +} void UtTest_Setup(void) { diff --git a/src/tests/idmap-api-test/idmap-api-test.c b/src/tests/idmap-api-test/idmap-api-test.c index 004d55e52..e2ea90b2b 100644 --- a/src/tests/idmap-api-test/idmap-api-test.c +++ b/src/tests/idmap-api-test/idmap-api-test.c @@ -96,8 +96,7 @@ void Test_Void_Fn(void) osal_id_t bin_sem_id_my_task; OS_BinSemCreate(&bin_sem_id_my_task, "BinSemTaskMyTask", 1, 0); OS_TaskDelay(5); - -} /* end Test_Void_Fn */ +} void TestIdMapApi_Setup(void) { diff --git a/src/tests/mutex-test/mutex-test.c b/src/tests/mutex-test/mutex-test.c index 7c9a91a83..30c412415 100644 --- a/src/tests/mutex-test/mutex-test.c +++ b/src/tests/mutex-test/mutex-test.c @@ -164,7 +164,6 @@ void task_3(void) while (1) { - status = OS_TaskDelay(300); status = OS_MutSemTake(mut_sem_id); if (status != OS_SUCCESS) diff --git a/src/tests/network-api-test/network-api-test.c b/src/tests/network-api-test/network-api-test.c index 25f04197f..f2426c3e2 100644 --- a/src/tests/network-api-test/network-api-test.c +++ b/src/tests/network-api-test/network-api-test.c @@ -214,8 +214,7 @@ void TestDatagramNetworkApi_Setup(void) OS_READ_WRITE), OS_SUCCESS); } - -} /* end TestDatagramNetworkApi_Setup */ +} /***************************************************************************** * @@ -339,8 +338,7 @@ void TestDatagramNetworkApi(void) UtAssert_INT32_EQ(OS_SocketGetIdByName(&objid, "127.0.0.1:9999"), OS_SUCCESS); UtAssert_True(OS_ObjectIdEqual(objid, p1_socket_id), "objid (%lu) == p1_socket_id", OS_ObjectIdToInteger(objid)); - -} /* end TestDatagramNetworkApi */ +} /***************************************************************************** * @@ -352,8 +350,7 @@ void TestDatagramNetworkApi_Teardown(void) /* Close sockets */ OS_close(p1_socket_id); OS_close(p2_socket_id); - -} /* end TestDatagramNetworkApi_Teardown */ +} /***************************************************************************** * @@ -445,8 +442,7 @@ void Server_Fn(void) } OS_close(s_socket_id); - -} /* end Server_Fn */ +} /***************************************************************************** * @@ -730,8 +726,7 @@ void TestStreamNetworkApi(void) } UtAssert_True(loopcnt < UT_EXIT_LOOP_MAX, "Task exited after %ld iterations", (long)loopcnt); } - -} /* end TestStreamNetworkApi */ +} /***************************************************************************** * @@ -742,8 +737,7 @@ void TestStreamNetworkApi_Teardown(void) { /* Close sockets */ OS_close(c_socket_id); - -} /* end TestStreamNetworkApi_Teardown */ +} void UtTest_Setup(void) { diff --git a/src/tests/osal-core-test/osal-core-test.c b/src/tests/osal-core-test/osal-core-test.c index 1559d9bf2..2f07df408 100644 --- a/src/tests/osal-core-test/osal-core-test.c +++ b/src/tests/osal-core-test/osal-core-test.c @@ -103,8 +103,7 @@ void UtTest_Setup(void) UtTest_Add(TestMutexes, NULL, NULL, "MSEM"); UtTest_Add(TestGetInfos, NULL, NULL, "INFO"); UtTest_Add(TestGenericQueries, NULL, NULL, "QUERIES"); - -} /* end OS_Application Startup */ +} /* **************** A TASK THAT RUNS FOREVER **************************** */ @@ -114,13 +113,11 @@ void task_generic_no_exit(void) { OS_TaskDelay(100); } -} /* end task_0 */ +} /* **************** A TASK THAT EXITS ITSELF **************************** */ -void task_generic_with_exit(void) -{ -} /* end task_0 */ +void task_generic_with_exit(void) {} typedef struct { @@ -255,8 +252,7 @@ void TestTasks(void) UtAssert_True(OS_TaskDelete(task_1_id) != OS_SUCCESS, "OS_TaskDelete, Task 1"); UtAssert_True(OS_TaskDelete(task_2_id) == OS_SUCCESS, "OS_TaskDelete, Task 2"); UtAssert_True(OS_TaskDelete(task_3_id) == OS_SUCCESS, "OS_TaskDelete, Task 3"); - -} /* end TestTasks */ +} /* ************************************************************************************ */ @@ -342,8 +338,7 @@ void TestQueues(void) status = OS_QueueDelete(msgq_3); UtAssert_True(status == OS_SUCCESS, "OS_QueueDelete, q 3"); - -} /* end TestQueues */ +} /* *************************************************************************** */ void TestBinaries(void) @@ -424,8 +419,7 @@ void TestBinaries(void) status = OS_BinSemDelete(bin_3); UtAssert_True(status == OS_SUCCESS, "OS_BinSemDelete, Bin 3"); - -} /* end TestBinaries */ +} /* ************************************************************************************ */ void TestMutexes(void) @@ -506,8 +500,7 @@ void TestMutexes(void) status = OS_MutSemDelete(mut_3); UtAssert_True(status == OS_SUCCESS, "OS_MutSemDelete, Mut 3"); - -} /* end TestMutexes */ +} /* These next several tasks simply initialize the ids to a number which * cannot occur in the system itself. This helps avoid confusion when a create @@ -521,7 +514,7 @@ void InitializeTaskIds(void) task_1_id = OS_OBJECT_ID_UNDEFINED; task_2_id = OS_OBJECT_ID_UNDEFINED; task_3_id = OS_OBJECT_ID_UNDEFINED; -} /* end InitializeTaskIds */ +} /* **************************************************************************** */ void InitializeQIds(void) @@ -530,7 +523,7 @@ void InitializeQIds(void) msgq_1 = OS_OBJECT_ID_UNDEFINED; msgq_2 = OS_OBJECT_ID_UNDEFINED; msgq_3 = OS_OBJECT_ID_UNDEFINED; -} /* end InitializeQIds */ +} /* ***************************************************************************** */ void InitializeBinIds(void) @@ -539,7 +532,7 @@ void InitializeBinIds(void) bin_1 = OS_OBJECT_ID_UNDEFINED; bin_2 = OS_OBJECT_ID_UNDEFINED; bin_3 = OS_OBJECT_ID_UNDEFINED; -} /* end InitializeBinIds */ +} /* ***************************************************************************** */ void InitializeMutIds(void) @@ -548,7 +541,7 @@ void InitializeMutIds(void) mut_1 = OS_OBJECT_ID_UNDEFINED; mut_2 = OS_OBJECT_ID_UNDEFINED; mut_3 = OS_OBJECT_ID_UNDEFINED; -} /* end InitializeMutIds */ +} /* ***************************************************************************** */ void TestGetInfos(void) diff --git a/src/tests/queue-test/queue-test.c b/src/tests/queue-test/queue-test.c index d2101a3d5..4f8870e1a 100644 --- a/src/tests/queue-test/queue-test.c +++ b/src/tests/queue-test/queue-test.c @@ -76,7 +76,6 @@ void task_1(void) /* if errors occur do not loop endlessly */ while (task_1_failures < 20) { - status = OS_QueueGet(msgq_id, (void *)&data_received, OSAL_SIZE_C(MSGQ_SIZE), &data_size, 1000); if (status == OS_SUCCESS) diff --git a/src/tests/select-test/select-test.c b/src/tests/select-test/select-test.c index 505f7354b..9a3e23503 100644 --- a/src/tests/select-test/select-test.c +++ b/src/tests/select-test/select-test.c @@ -174,8 +174,7 @@ void Server_Fn(void) UtAssert_INT32_EQ(OS_SocketAccept(s1_socket_id, &connsock_id, &addr, OS_PEND), OS_SUCCESS); UtAssert_INT32_EQ(OS_BinSemTake(bin_sem_id), OS_SUCCESS); UtAssert_INT32_EQ(OS_close(connsock_id), OS_SUCCESS); - -} /* end Server_Fn */ +} void Server_Fn2(void) { @@ -185,8 +184,7 @@ void Server_Fn2(void) /* Accept incoming connections */ UtAssert_INT32_EQ(OS_SocketAccept(s2_socket_id, &connsock_id, &addr, OS_PEND), OS_SUCCESS); UtAssert_INT32_EQ(OS_close(connsock_id), OS_SUCCESS); - -} /* end Server_Fn */ +} void Setup_Single(void) { diff --git a/src/tests/shell-test/shell-test.c b/src/tests/shell-test/shell-test.c index 359175734..bf333c120 100644 --- a/src/tests/shell-test/shell-test.c +++ b/src/tests/shell-test/shell-test.c @@ -129,8 +129,7 @@ void TestOutputToFile(void) /* try removing the file from the drive */ status = OS_remove(OS_TEST_SHELL_FILENAME); UtAssert_True(status == OS_SUCCESS, "status after remove = %d", (int)status); - -} /* end TestOutputToFile */ +} void UtTest_Setup(void) { diff --git a/src/tests/symbol-api-test/symbol-api-test.c b/src/tests/symbol-api-test/symbol-api-test.c index 99cd8c40b..78de352a2 100644 --- a/src/tests/symbol-api-test/symbol-api-test.c +++ b/src/tests/symbol-api-test/symbol-api-test.c @@ -133,7 +133,7 @@ void TestSymbolApi(void) UtAssert_True(status != OS_SUCCESS, "OS_SymbolLookup(ShouldNotExist) = %d, Addr = %lx", (int)status, (unsigned long)SymAddress); } -} /* end TestSymbolApi */ +} void UtTest_Setup(void) { diff --git a/src/tests/time-base-api-test/time-base-api-test.c b/src/tests/time-base-api-test/time-base-api-test.c index ee0652ecb..6ce05160a 100644 --- a/src/tests/time-base-api-test/time-base-api-test.c +++ b/src/tests/time-base-api-test/time-base-api-test.c @@ -224,8 +224,7 @@ void TestTimeBaseApi(void) UtAssert_INT32_EQ(OS_TimeBaseGetFreeRun(OS_OBJECT_ID_UNDEFINED, &freerun), OS_ERR_INVALID_ID); UtAssert_INT32_EQ(OS_TimeBaseGetFreeRun(badid, &freerun), OS_ERR_INVALID_ID); UtAssert_INT32_EQ(OS_TimeBaseGetFreeRun(time_base_id2, NULL), OS_INVALID_POINTER); - -} /* end TestTimeBaseApi */ +} void UtTest_Setup(void) { diff --git a/src/tests/timer-add-api-test/timer-add-api-test.c b/src/tests/timer-add-api-test/timer-add-api-test.c index 9c661a185..6f34f01bd 100644 --- a/src/tests/timer-add-api-test/timer-add-api-test.c +++ b/src/tests/timer-add-api-test/timer-add-api-test.c @@ -187,8 +187,7 @@ void TestTimerAddApi(void) UtAssert_INT32_EQ(OS_TimerAdd(&timer_id, "Timer", time_base_id, NULL, NULL), OS_INVALID_POINTER); UtAssert_INT32_EQ(OS_TimerAdd(&timer_id, "Timer", time_base_id, null_func, NULL), OS_ERR_NAME_TAKEN); UtAssert_INT32_EQ(OS_TimerAdd(&timer_id, 0, time_base_id, null_func, NULL), OS_INVALID_POINTER); - -} /* end TestTimerAddApi */ +} void UtTest_Setup(void) { diff --git a/src/tests/timer-test/timer-test.c b/src/tests/timer-test/timer-test.c index 3f37dd8ac..a2ba04b7b 100644 --- a/src/tests/timer-test/timer-test.c +++ b/src/tests/timer-test/timer-test.c @@ -66,7 +66,6 @@ void test_func(osal_id_t timer_id) void UtTest_Setup(void) { - if (OS_API_Init() != OS_SUCCESS) { UtAssert_Abort("OS_API_Init() failed"); @@ -111,7 +110,6 @@ void TimerTestSetup(void) void TimerTestTask(void) { - int i = 0; int32 TimerStatus[NUMBER_OF_TIMERS]; osal_index_t TableId = OSAL_INDEX_C(0); diff --git a/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c b/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c index 2029ac32d..8a6fcb24e 100644 --- a/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c +++ b/src/unit-test-coverage/portable/src/coveragetest-bsd-select.c @@ -117,8 +117,7 @@ void Test_OS_SelectSingle_Impl(void) UT_PortablePosixIOTest_Set_FD(UT_INDEX_0, OCS_FD_SETSIZE); UT_PortablePosixIOTest_Set_Selectable(UT_INDEX_0, true); OSAPI_TEST_FUNCTION_RC(OS_SelectSingle_Impl, (&token, &SelectFlags, 0), OS_ERR_OPERATION_NOT_SUPPORTED); - -} /* end OS_SelectSingle_Impl */ +} void Test_OS_SelectMultiple_Impl(void) { @@ -186,7 +185,7 @@ void Test_OS_SelectMultiple_Impl(void) UT_PortablePosixIOTest_Set_FD(OSAL_INDEX_C(i), -1); } OSAPI_TEST_FUNCTION_RC(OS_SelectMultiple_Impl, (&ReadSet, &WriteSet, 0), OS_SUCCESS); -} /* end OS_SelectMultiple_Impl */ +} /* ------------------- End of test cases --------------------------------------*/ diff --git a/src/unit-test-coverage/shared/src/coveragetest-common.c b/src/unit-test-coverage/shared/src/coveragetest-common.c index d73f833aa..8ee1b8986 100644 --- a/src/unit-test-coverage/shared/src/coveragetest-common.c +++ b/src/unit-test-coverage/shared/src/coveragetest-common.c @@ -72,7 +72,6 @@ static int32 ObjectDeleteCountHook(void *UserObj, int32 StubRetcode, uint32 Call /* Always returns 1 so TryCount will be exceeded */ static int32 ObjectDeleteFailHook(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context) { - uint32 *counter = UT_Hook_GetArgValueByName(Context, "callback_arg", uint32 *); *counter = 1; diff --git a/src/unit-test-coverage/shared/src/coveragetest-heap.c b/src/unit-test-coverage/shared/src/coveragetest-heap.c index 5ff11c224..a46765610 100644 --- a/src/unit-test-coverage/shared/src/coveragetest-heap.c +++ b/src/unit-test-coverage/shared/src/coveragetest-heap.c @@ -42,6 +42,7 @@ void Test_OS_HeapGetInfo(void) UtAssert_True(actual == expected, "OS_HeapGetInfo() (%ld) == OS_INVALID_POINTER", (long)actual); } + /* Osapi_Test_Setup * * Purpose: diff --git a/src/unit-test-coverage/shared/src/coveragetest-task.c b/src/unit-test-coverage/shared/src/coveragetest-task.c index df09d3d99..02e75f463 100644 --- a/src/unit-test-coverage/shared/src/coveragetest-task.c +++ b/src/unit-test-coverage/shared/src/coveragetest-task.c @@ -172,6 +172,7 @@ void Test_OS_TaskExit(void) OS_TaskExit(); UtAssert_STUB_COUNT(OS_ObjectIdFinalizeDelete, 0); } + void Test_OS_TaskDelay(void) { /* @@ -180,6 +181,7 @@ void Test_OS_TaskDelay(void) */ OSAPI_TEST_FUNCTION_RC(OS_TaskDelay(1), OS_SUCCESS); } + void Test_OS_TaskSetPriority(void) { /* @@ -194,6 +196,7 @@ void Test_OS_TaskSetPriority(void) UT_SetDeferredRetcode(UT_KEY(OS_TaskSetPriority_Impl), 1, OS_ERROR); OSAPI_TEST_FUNCTION_RC(OS_TaskSetPriority(UT_OBJID_1, OSAL_PRIORITY_C(1)), OS_ERROR); } + void Test_OS_TaskGetId(void) { /* diff --git a/src/unit-test-coverage/shared/src/coveragetest-time.c b/src/unit-test-coverage/shared/src/coveragetest-time.c index 76accad47..a1e30255c 100644 --- a/src/unit-test-coverage/shared/src/coveragetest-time.c +++ b/src/unit-test-coverage/shared/src/coveragetest-time.c @@ -36,6 +36,7 @@ void UT_TimerCallback(osal_id_t timer_id) { ++UT_TimerCount; } + void UT_TimerArgCallback(osal_id_t object_id, void *arg) { ++UT_TimerArgCount; diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h b/src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h index e6c1cad2d..3bbad9660 100644 --- a/src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h +++ b/src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h @@ -60,7 +60,6 @@ void OCS_OS_BSP_Lock_Impl(void); void OCS_OS_BSP_Unlock_Impl(void); /*---------------------------------------------------------------- - Function: OS_BSP_ConsoleOutput_Impl Purpose: Low level raw console data output. Writes a sequence of characters directly to the BSP debug terminal or console device. @@ -75,7 +74,6 @@ void OCS_OS_BSP_Unlock_Impl(void); extern void OCS_OS_BSP_ConsoleOutput_Impl(const char *Str, size_t DataLen); /*---------------------------------------------------------------- - Function: OS_BSP_ConsoleSetMode_Impl Purpose: Set the console output mode, if supported by the BSP. diff --git a/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h b/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h index 958c76437..c46be2ff3 100644 --- a/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h +++ b/src/unit-test-coverage/ut-stubs/inc/OCS_moduleLib.h @@ -53,7 +53,6 @@ typedef struct OCS_MODULE_INFO unsigned long bssAddr; unsigned long bssSize; } segInfo; - } OCS_MODULE_INFO; /* ----------------------------------------- */ diff --git a/src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c b/src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c index feaa457b1..7c830ff70 100644 --- a/src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c @@ -45,7 +45,6 @@ void OCS_OS_BSP_Unlock_Impl(void) } /*---------------------------------------------------------------- - Function: OS_BSP_ConsoleOutput_Impl Purpose: Low level raw console data output. Writes a sequence of characters directly to the BSP debug terminal or console device. @@ -68,7 +67,6 @@ void OCS_OS_BSP_ConsoleOutput_Impl(const char *Str, size_t DataLen) } /*---------------------------------------------------------------- - Function: OS_BSP_ConsoleSetMode_Impl Purpose: Set the console output mode, if supported by the BSP. diff --git a/src/unit-test-coverage/ut-stubs/src/os-shared-common-impl-stubs.c b/src/unit-test-coverage/ut-stubs/src/os-shared-common-impl-stubs.c index 25198883a..9e0ed2e80 100644 --- a/src/unit-test-coverage/ut-stubs/src/os-shared-common-impl-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/os-shared-common-impl-stubs.c @@ -32,7 +32,6 @@ */ void OS_ApplicationShutdown_Impl(void) { - UT_GenStub_Execute(OS_ApplicationShutdown_Impl, Basic, NULL); } @@ -43,6 +42,5 @@ void OS_ApplicationShutdown_Impl(void) */ void OS_IdleLoop_Impl(void) { - UT_GenStub_Execute(OS_IdleLoop_Impl, Basic, NULL); } diff --git a/src/unit-test-coverage/ut-stubs/src/os-shared-task-impl-stubs.c b/src/unit-test-coverage/ut-stubs/src/os-shared-task-impl-stubs.c index cf5317e09..c5b9bc600 100644 --- a/src/unit-test-coverage/ut-stubs/src/os-shared-task-impl-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/os-shared-task-impl-stubs.c @@ -97,7 +97,6 @@ int32 OS_TaskDetach_Impl(const OS_object_token_t *token) */ void OS_TaskExit_Impl(void) { - UT_GenStub_Execute(OS_TaskExit_Impl, Basic, NULL); } diff --git a/src/unit-test-coverage/ut-stubs/src/posix-pthread-stubs.c b/src/unit-test-coverage/ut-stubs/src/posix-pthread-stubs.c index 8aff1c495..136b5dcd9 100644 --- a/src/unit-test-coverage/ut-stubs/src/posix-pthread-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/posix-pthread-stubs.c @@ -121,6 +121,7 @@ int OCS_pthread_cond_init(OCS_pthread_cond_t *cond, const OCS_pthread_condattr_t return Status; } + int OCS_pthread_cond_signal(OCS_pthread_cond_t *cond) { int32 Status; diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c index f8a44191c..71ee124a5 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c @@ -27,18 +27,22 @@ OCS_STATUS OCS_intConnect(OCS_VOIDFUNCPTR *vector, OCS_VOIDFUNCPTR routine, int { return UT_DEFAULT_IMPL(OCS_intConnect); } + int OCS_intDisable(int level) { return UT_DEFAULT_IMPL(OCS_intDisable); } + int OCS_intEnable(int level) { return UT_DEFAULT_IMPL(OCS_intEnable); } + int OCS_intLock(void) { return UT_DEFAULT_IMPL(OCS_intLock); } + int OCS_intUnlock(int lockKey) { return UT_DEFAULT_IMPL(OCS_intUnlock); diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c index 737f8bcb8..1f1a0f828 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c @@ -42,14 +42,17 @@ OCS_MSG_Q_ID OCS_msgQCreate(int maxMsgs, int maxMsgLength, int options) return retval; } + OCS_STATUS OCS_msgQDelete(OCS_MSG_Q_ID msgQId) { return UT_DEFAULT_IMPL(OCS_msgQDelete); } + int OCS_msgQReceive(OCS_MSG_Q_ID msgQId, char *buffer, OCS_UINT maxNBytes, int timeout) { return UT_DEFAULT_IMPL(OCS_msgQReceive); } + OCS_STATUS OCS_msgQSend(OCS_MSG_Q_ID msgQId, char *buffer, OCS_UINT nBytes, int timeout, int priority) { return UT_DEFAULT_IMPL(OCS_msgQSend); diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c index ecb6046a6..793ebabef 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c @@ -38,6 +38,7 @@ OCS_SEM_ID OCS_semBInitialize(OCS_SEM *pSemMem, int options, OCS_SEM_B_STATE ini return retval; } + OCS_SEM_ID OCS_semBCreate(int options, OCS_SEM_B_STATE initialState) { OCS_SEM_ID retval = NULL; @@ -51,6 +52,7 @@ OCS_SEM_ID OCS_semBCreate(int options, OCS_SEM_B_STATE initialState) return retval; } + OCS_SEM_ID OCS_semMInitialize(OCS_SEM *pSemMem, int options) { OCS_SEM_ID retval = NULL; @@ -64,6 +66,7 @@ OCS_SEM_ID OCS_semMInitialize(OCS_SEM *pSemMem, int options) return retval; } + OCS_SEM_ID OCS_semMCreate(int options) { OCS_SEM_ID retval = NULL; @@ -77,6 +80,7 @@ OCS_SEM_ID OCS_semMCreate(int options) return retval; } + OCS_SEM_ID OCS_semCInitialize(OCS_SEM *pSemMem, int options, int initialCount) { OCS_SEM_ID retval = NULL; @@ -90,6 +94,7 @@ OCS_SEM_ID OCS_semCInitialize(OCS_SEM *pSemMem, int options, int initialCount) return retval; } + OCS_SEM_ID OCS_semCCreate(int flags, int count) { OCS_SEM_ID retval = NULL; @@ -108,14 +113,17 @@ OCS_STATUS OCS_semDelete(OCS_SEM_ID semId) { return UT_DEFAULT_IMPL(OCS_semDelete); } + OCS_STATUS OCS_semFlush(OCS_SEM_ID semId) { return UT_DEFAULT_IMPL(OCS_semFlush); } + OCS_STATUS OCS_semTake(OCS_SEM_ID semId, int timeout) { return UT_DEFAULT_IMPL(OCS_semTake); } + OCS_STATUS OCS_semGive(OCS_SEM_ID semId) { return UT_DEFAULT_IMPL(OCS_semGive); diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c index 9421ca25d..cb865937b 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c @@ -30,6 +30,7 @@ void OCS_taskExit(int code) { UT_DEFAULT_IMPL(OCS_taskExit); } + OCS_TASK_ID OCS_taskIdSelf(void) { int32 Status; @@ -42,6 +43,7 @@ OCS_TASK_ID OCS_taskIdSelf(void) return &OCS_LOCAL_TASK; } + OCS_TASK_ID OCS_taskNameToId(const char *name) { int32 Status; @@ -54,26 +56,32 @@ OCS_TASK_ID OCS_taskNameToId(const char *name) return &OCS_LOCAL_TASK; } + OCS_STATUS OCS_taskDelay(int ticks) { return UT_DEFAULT_IMPL(OCS_taskDelay); } + OCS_STATUS OCS_taskDelete(OCS_TASK_ID tid) { return UT_DEFAULT_IMPL(OCS_taskDelete); } + OCS_STATUS OCS_taskDeleteForce(OCS_TASK_ID tid) { return UT_DEFAULT_IMPL(OCS_taskDeleteForce); } + OCS_STATUS OCS_taskSuspend(OCS_TASK_ID tid) { return UT_DEFAULT_IMPL(OCS_taskSuspend); } + OCS_STATUS OCS_taskResume(OCS_TASK_ID tid) { return UT_DEFAULT_IMPL(OCS_taskResume); } + OCS_STATUS OCS_taskPrioritySet(OCS_TASK_ID tid, int newPriority) { return UT_DEFAULT_IMPL(OCS_taskPrioritySet); diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-common.c b/src/unit-test-coverage/vxworks/src/coveragetest-common.c index 1a67217b4..e2a5f4c66 100644 --- a/src/unit-test-coverage/vxworks/src/coveragetest-common.c +++ b/src/unit-test-coverage/vxworks/src/coveragetest-common.c @@ -85,7 +85,7 @@ void Test_OS_VxWorks_GenericSemGive(void) OSAPI_TEST_FUNCTION_RC(OS_VxWorks_GenericSemGive(SemID), OS_SUCCESS); UT_SetDefaultReturnValue(UT_KEY(OCS_semGive), OCS_ERROR); OSAPI_TEST_FUNCTION_RC(OS_VxWorks_GenericSemGive(SemID), OS_SEM_FAILURE); -} /* end OS_VxWorks_GenericSemGive */ +} void Test_OS_VxWorks_GenericSemTake(void) { @@ -104,8 +104,7 @@ void Test_OS_VxWorks_GenericSemTake(void) OCS_errno = OCS_S_objLib_OBJ_UNAVAILABLE; OSAPI_TEST_FUNCTION_RC(OS_VxWorks_GenericSemTake(SemID, 0), OS_SEM_TIMEOUT); OSAPI_TEST_FUNCTION_RC(OS_VxWorks_GenericSemTake(SemID, 1), OS_SEM_FAILURE); - -} /* end OS_VxWorks_GenericSemTake */ +} /* ------------------- End of test cases --------------------------------------*/ diff --git a/src/unit-test-coverage/vxworks/src/coveragetest-network.c b/src/unit-test-coverage/vxworks/src/coveragetest-network.c index c66694db0..aa924b099 100644 --- a/src/unit-test-coverage/vxworks/src/coveragetest-network.c +++ b/src/unit-test-coverage/vxworks/src/coveragetest-network.c @@ -30,8 +30,6 @@ #include "OCS_hostLib.h" /*---------------------------------------------------------------- - * - * Function: OS_NetworkGetHostName_Impl * * Purpose: Implemented per internal OSAL API * See prototype for argument/return detail @@ -49,8 +47,7 @@ void Test_OS_NetworkGetHostName_Impl(void) OSAPI_TEST_FUNCTION_RC(OS_NetworkGetHostName_Impl(buffer, sizeof(buffer)), OS_SUCCESS); UT_SetDefaultReturnValue(UT_KEY(OCS_gethostname), -1); OSAPI_TEST_FUNCTION_RC(OS_NetworkGetHostName_Impl(buffer, sizeof(buffer)), OS_ERROR); - -} /* end OS_NetworkGetHostName_Impl */ +} void Test_OS_NetworkGetID_Impl(void) @@ -70,8 +67,7 @@ void Test_OS_NetworkGetID_Impl(void) UT_SetDefaultReturnValue(UT_KEY(OCS_gethostname), OCS_ERROR); OSAPI_TEST_FUNCTION_RC(OS_NetworkGetID_Impl(&IdBuf), OS_ERROR); - -} /* end OS_NetworkGetID_Impl */ +} /* ------------------- End of test cases --------------------------------------*/ diff --git a/src/unit-tests/ostimer-test/ut_ostimer_timerio_test.c b/src/unit-tests/ostimer-test/ut_ostimer_timerio_test.c index 9c36939b6..c52c87ac8 100644 --- a/src/unit-tests/ostimer-test/ut_ostimer_timerio_test.c +++ b/src/unit-tests/ostimer-test/ut_ostimer_timerio_test.c @@ -55,7 +55,6 @@ typedef struct { bool IsTested; OS_timer_prop_t Prop; - } UT_reconf_status_t; /*--------------------------------------------------------------------------------* diff --git a/src/ut-stubs/osapi-clock-handlers.c b/src/ut-stubs/osapi-clock-handlers.c index 3515af4f9..3cbafa955 100644 --- a/src/ut-stubs/osapi-clock-handlers.c +++ b/src/ut-stubs/osapi-clock-handlers.c @@ -49,8 +49,7 @@ void UT_DefaultHandler_OS_GetLocalTime(void *UserObj, UT_EntryKey_t FuncKey, con { *time_struct = OS_TimeAssembleFromNanoseconds(1 + (count / 100), 10000000 * (count % 100)); } - -} /* end OS_GetLocalTime */ +} /* * ----------------------------------------------------------------- @@ -68,5 +67,4 @@ void UT_DefaultHandler_OS_SetLocalTime(void *UserObj, UT_EntryKey_t FuncKey, con { UT_Stub_CopyFromLocal(UT_KEY(OS_SetLocalTime), time_struct, sizeof(*time_struct)); } - } /*end OS_SetLocalTime */ diff --git a/src/ut-stubs/osapi-common-stubs.c b/src/ut-stubs/osapi-common-stubs.c index d3e85afb6..68149e22f 100644 --- a/src/ut-stubs/osapi-common-stubs.c +++ b/src/ut-stubs/osapi-common-stubs.c @@ -46,7 +46,6 @@ int32 OS_API_Init(void) */ void OS_API_Teardown(void) { - UT_GenStub_Execute(OS_API_Teardown, Basic, NULL); } @@ -81,7 +80,6 @@ void OS_ApplicationShutdown(uint8 flag) */ void OS_DeleteAllObjects(void) { - UT_GenStub_Execute(OS_DeleteAllObjects, Basic, NULL); } @@ -92,7 +90,6 @@ void OS_DeleteAllObjects(void) */ void OS_IdleLoop(void) { - UT_GenStub_Execute(OS_IdleLoop, Basic, NULL); } diff --git a/src/ut-stubs/osapi-idmap-handlers.c b/src/ut-stubs/osapi-idmap-handlers.c index 3c733bdaf..ec7b73592 100644 --- a/src/ut-stubs/osapi-idmap-handlers.c +++ b/src/ut-stubs/osapi-idmap-handlers.c @@ -117,8 +117,7 @@ void UT_DefaultHandler_OS_ConvertToArrayIndex(void *UserObj, UT_EntryKey_t FuncK } *ArrayIndex = OSAL_INDEX_C(tempserial); - -} /* end OS_ConvertToArrayIndex */ +} /* * ----------------------------------------------------------------- diff --git a/src/ut-stubs/osapi-printf-stubs.c b/src/ut-stubs/osapi-printf-stubs.c index 049bd6847..368dd4c84 100644 --- a/src/ut-stubs/osapi-printf-stubs.c +++ b/src/ut-stubs/osapi-printf-stubs.c @@ -52,7 +52,6 @@ void OS_printf(const char *string, ...) */ void OS_printf_disable(void) { - UT_GenStub_Execute(OS_printf_disable, Basic, NULL); } @@ -63,6 +62,5 @@ void OS_printf_disable(void) */ void OS_printf_enable(void) { - UT_GenStub_Execute(OS_printf_enable, Basic, NULL); } diff --git a/src/ut-stubs/osapi-task-stubs.c b/src/ut-stubs/osapi-task-stubs.c index cbf69af59..a59580c09 100644 --- a/src/ut-stubs/osapi-task-stubs.c +++ b/src/ut-stubs/osapi-task-stubs.c @@ -94,7 +94,6 @@ int32 OS_TaskDelete(osal_id_t task_id) */ void OS_TaskExit(void) { - UT_GenStub_Execute(OS_TaskExit, Basic, NULL); } diff --git a/src/ut-stubs/osapi-version-stubs.c b/src/ut-stubs/osapi-version-stubs.c index 6699ea696..24272912c 100644 --- a/src/ut-stubs/osapi-version-stubs.c +++ b/src/ut-stubs/osapi-version-stubs.c @@ -63,7 +63,6 @@ const char *OS_GetVersionCodeName(void) */ void OS_GetVersionNumber(uint8 VersionNumbers[4]) { - UT_GenStub_Execute(OS_GetVersionNumber, Basic, NULL); } diff --git a/ut_assert/scripts/generate_stubs.pl b/ut_assert/scripts/generate_stubs.pl index f3073d7cc..a426ee2e7 100755 --- a/ut_assert/scripts/generate_stubs.pl +++ b/ut_assert/scripts/generate_stubs.pl @@ -280,7 +280,6 @@ $basename =~ s/\..*$//; # trim filename extension $publicapi->{$basename} = { boilerplate => $file_boilerplate, variadic => $file_variadic, api => $fileapi }; } - } # Now generate a stub function for all items in API diff --git a/ut_assert/src/uttools.c b/ut_assert/src/uttools.c index 57d5a809e..f593c59ab 100644 --- a/ut_assert/src/uttools.c +++ b/ut_assert/src/uttools.c @@ -233,7 +233,6 @@ bool UtMem2BinFileCmp(const void *Memory, const char *Filename) Success = true; if ((fp = fopen(Filename, "r"))) { - for (i = 0; (FileByte = fgetc(fp)) != EOF; i++) { if (MemByte[i] != FileByte) From f03aa39c49732ee2c79aba968d135231d7dffd81 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 17 Oct 2022 10:36:49 -0400 Subject: [PATCH 6/6] Bump to v7.0.0-rc4+dev143 --- CHANGELOG.md | 8 ++++++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78e196547..9a77fb72b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## Development Build: v6.0.0-rc4:dev143 +- locks for condvar objects on rtems/vxworks +- Add time conversion reciprocal functions +- add export targets and package script +- Stop empty function catching CI workflow format checks +- Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines. +- See , , , , and + ## Development Build: v6.0.0-rc4+dev131 - rtems queue multi-size, mimic posix logic - cmake script modernization diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index a73a2ea0c..ced728c20 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 131 +#define OS_BUILD_NUMBER 143 #define OS_BUILD_BASELINE "v6.0.0-rc4" /*