Skip to content

Commit 14ec378

Browse files
committed
Merge pull request #1234 from ic-caelum-dev6-hotfix-format
HOTFIX IC:Caelum-rc4+dev6, Fix failed format check
2 parents fafb045 + a172a7c commit 14ec378

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

src/os/inc/osapi-version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
/*
4343
* Version Macro Definitions
4444
*/
45-
#define OS_MAJOR_VERSION 5 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
46-
#define OS_MINOR_VERSION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
47-
#define OS_REVISION 99 /*!< * Set to 0 on OFFICIAL releases, and set to 99 on development versions. Revision number. */
45+
#define OS_MAJOR_VERSION 5 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
46+
#define OS_MINOR_VERSION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
47+
#define OS_REVISION 99 /*!< @brief Set to 99 on DEVELOPMENT versions. Revision number. */
4848

4949
/*!
5050
* @brief Mission revision.

src/os/rtems/inc/os-rtems.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070

7171
#endif
7272

73-
7473
/****************************************************************************************
7574
TYPEDEFS
7675
***************************************************************************************/

src/os/rtems/src/os-impl-loader.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token)
227227
*-----------------------------------------------------------------*/
228228
int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *module_prop)
229229
{
230-
rtems_rtl_obj *obj;
230+
rtems_rtl_obj * obj;
231231
OS_impl_module_internal_record_t *impl;
232232
int32 status = OS_ERROR;
233233

@@ -242,12 +242,12 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo
242242
if (obj != NULL)
243243
{
244244
module_prop->addr.valid = true;
245-
module_prop->addr.code_address = (cpuaddr) obj->text_base;
246-
module_prop->addr.code_size = (cpuaddr) rtems_rtl_obj_text_size(obj);
247-
module_prop->addr.data_address = (cpuaddr) obj->data_base;
248-
module_prop->addr.data_size = (cpuaddr) rtems_rtl_obj_data_size(obj);
249-
module_prop->addr.bss_address = (cpuaddr) obj->bss_base;
250-
module_prop->addr.bss_size = (cpuaddr) rtems_rtl_obj_bss_size(obj);
245+
module_prop->addr.code_address = (cpuaddr)obj->text_base;
246+
module_prop->addr.code_size = (cpuaddr)rtems_rtl_obj_text_size(obj);
247+
module_prop->addr.data_address = (cpuaddr)obj->data_base;
248+
module_prop->addr.data_size = (cpuaddr)rtems_rtl_obj_data_size(obj);
249+
module_prop->addr.bss_address = (cpuaddr)obj->bss_base;
250+
module_prop->addr.bss_size = (cpuaddr)rtems_rtl_obj_bss_size(obj);
251251

252252
status = OS_SUCCESS;
253253
}

0 commit comments

Comments
 (0)