ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix IAR coding style and thread/mutex namingin mbed_boot.c

pull/4294/head
Bartek Szatkowski 2017-05-23 11:27:10 +01:00 committed by Martin Kojtal
parent b01f13d1a0
commit e66f9ee818
1 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtos/mbed_boot.c
View File

@ -362,6 +362,7 @@ void $Sub$$__cpp_initialize__aeabi_(void)
void pre_main() void pre_main()
{ {
singleton_mutex_attr.name = "singleton_mutex";
singleton_mutex_attr.attr_bits = osMutexRecursive; singleton_mutex_attr.attr_bits = osMutexRecursive;
singleton_mutex_attr.cb_size = sizeof(singleton_mutex_obj); singleton_mutex_attr.cb_size = sizeof(singleton_mutex_obj);
singleton_mutex_attr.cb_mem = &singleton_mutex_obj; singleton_mutex_attr.cb_mem = &singleton_mutex_obj;
@ -548,6 +549,7 @@ void __iar_program_start( void )
low_level_init_needed_local = __low_level_init(); low_level_init_needed_local = __low_level_init();
if (low_level_init_needed_local) { if (low_level_init_needed_local) {
__iar_data_init3(); __iar_data_init3();
/* Copy the vector table to RAM only if uVisor is not in use. */ /* Copy the vector table to RAM only if uVisor is not in use. */
#if !(defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED)) #if !(defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED))
mbed_cpy_nvic(); mbed_cpy_nvic();
@ -578,6 +580,7 @@ void __iar_system_Mtxinit(__iar_Rmtx *mutex) /* Initialize a system lock */
uint32_t index; uint32_t index;
for (index = 0; index < _MAX_LOCK; index++) { for (index = 0; index < _MAX_LOCK; index++) {
if (0 == std_mutex_id_sys[index]) { if (0 == std_mutex_id_sys[index]) {
attr.name = "system_mutex";
attr.cb_mem = &std_mutex_sys[index]; attr.cb_mem = &std_mutex_sys[index];
attr.cb_size = sizeof(std_mutex_sys[index]); attr.cb_size = sizeof(std_mutex_sys[index]);
attr.attr_bits = osMutexRecursive; attr.attr_bits = osMutexRecursive;
@ -613,6 +616,7 @@ void __iar_file_Mtxinit(__iar_Rmtx *mutex) /* Initialize a file lock */
uint32_t index; uint32_t index;
for (index = 0; index < _FOPEN_MAX; index++) { for (index = 0; index < _FOPEN_MAX; index++) {
if (0 == std_mutex_id_file[index]) { if (0 == std_mutex_id_file[index]) {
attr.name = "file_mutex";
attr.cb_mem = &std_mutex_file[index]; attr.cb_mem = &std_mutex_file[index];
attr.cb_size = sizeof(std_mutex_file[index]); attr.cb_size = sizeof(std_mutex_file[index]);
attr.attr_bits = osMutexRecursive; attr.attr_bits = osMutexRecursive;