Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HOTFIX IC:Caelum-rc4+dev6, Fix failed format check #1234

Merged
merged 1 commit into from
Mar 25, 2022
Merged

HOTFIX IC:Caelum-rc4+dev6, Fix failed format check #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/os/inc/osapi-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion src/os/rtems/inc/os-rtems.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@

#endif


/****************************************************************************************
TYPEDEFS
***************************************************************************************/
Expand Down
14 changes: 7 additions & 7 deletions src/os/rtems/src/os-impl-loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand Down