From 7e5419eeef4d6060c6b16a6bb40f5a37060c1828 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Thu, 24 Mar 2022 16:42:36 -0600 Subject: [PATCH] Fix #1235, Follow-on format cleanup --- src/os/inc/osapi-version.h | 3 ++- src/os/rtems/inc/os-rtems.h | 1 - src/os/rtems/src/os-impl-loader.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 21770707c..26926e408 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -42,7 +42,8 @@ */ #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_REVISION \ + 99 /*!< * Set to 0 on OFFICIAL releases, and 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 a394d631c..ca250a19c 100644 --- a/src/os/rtems/inc/os-rtems.h +++ b/src/os/rtems/inc/os-rtems.h @@ -68,7 +68,6 @@ #endif - /**************************************************************************************** TYPEDEFS ***************************************************************************************/ diff --git a/src/os/rtems/src/os-impl-loader.c b/src/os/rtems/src/os-impl-loader.c index d7504989d..4974aaa48 100644 --- a/src/os/rtems/src/os-impl-loader.c +++ b/src/os/rtems/src/os-impl-loader.c @@ -225,7 +225,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; @@ -240,12 +240,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; }