From a172a7cbb4c371114f950606995e7b43f7392c92 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Thu, 17 Mar 2022 10:00:00 -0400 Subject: [PATCH] HOTFIX IC:Caelum-rc4+dev6, Fix failed format check --- src/os/inc/osapi-version.h | 6 +++--- src/os/rtems/inc/os-rtems.h | 1 - src/os/rtems/src/os-impl-loader.c | 14 +++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 048cd2eba..f2691dc43 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -42,9 +42,9 @@ /* * Version Macro Definitions */ -#define OS_MAJOR_VERSION 5 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ -#define OS_MINOR_VERSION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ -#define OS_REVISION 99 /*!< * Set to 0 on OFFICIAL releases, and set to 99 on development versions. Revision number. */ +#define OS_MAJOR_VERSION 5 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ +#define OS_MINOR_VERSION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ +#define OS_REVISION 99 /*!< @brief Set to 99 on DEVELOPMENT versions. Revision number. */ /*! * @brief Mission revision. diff --git a/src/os/rtems/inc/os-rtems.h b/src/os/rtems/inc/os-rtems.h index 52e904442..59ec447b8 100644 --- a/src/os/rtems/inc/os-rtems.h +++ b/src/os/rtems/inc/os-rtems.h @@ -70,7 +70,6 @@ #endif - /**************************************************************************************** TYPEDEFS ***************************************************************************************/ diff --git a/src/os/rtems/src/os-impl-loader.c b/src/os/rtems/src/os-impl-loader.c index 73baa8957..b42db43b3 100644 --- a/src/os/rtems/src/os-impl-loader.c +++ b/src/os/rtems/src/os-impl-loader.c @@ -227,7 +227,7 @@ 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) { - rtems_rtl_obj *obj; + rtems_rtl_obj * obj; OS_impl_module_internal_record_t *impl; int32 status = OS_ERROR; @@ -242,12 +242,12 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo if (obj != NULL) { module_prop->addr.valid = true; - module_prop->addr.code_address = (cpuaddr) obj->text_base; - module_prop->addr.code_size = (cpuaddr) rtems_rtl_obj_text_size(obj); - module_prop->addr.data_address = (cpuaddr) obj->data_base; - module_prop->addr.data_size = (cpuaddr) rtems_rtl_obj_data_size(obj); - module_prop->addr.bss_address = (cpuaddr) obj->bss_base; - module_prop->addr.bss_size = (cpuaddr) rtems_rtl_obj_bss_size(obj); + module_prop->addr.code_address = (cpuaddr)obj->text_base; + module_prop->addr.code_size = (cpuaddr)rtems_rtl_obj_text_size(obj); + module_prop->addr.data_address = (cpuaddr)obj->data_base; + module_prop->addr.data_size = (cpuaddr)rtems_rtl_obj_data_size(obj); + module_prop->addr.bss_address = (cpuaddr)obj->bss_base; + module_prop->addr.bss_size = (cpuaddr)rtems_rtl_obj_bss_size(obj); status = OS_SUCCESS; }