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

Merge pull request #1998 from bridadan/mbed-main-iar-rtx 

Calling mbed_main when using RTX and compiling with IAR
pull/2014/head
Sam Grove 2016-06-26 00:50:44 -05:00 committed by GitHub
parent 245d4b8deb 93773bad68
commit 703aee4f61
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h
View File

@ -713,6 +713,8 @@ extern __weak void __iar_init_core( void );
extern __weak void __iar_init_vfp( void ); extern __weak void __iar_init_vfp( void );
extern void __iar_dynamic_initialization(void); extern void __iar_dynamic_initialization(void);
extern void mbed_sdk_init(void); extern void mbed_sdk_init(void);
extern void mbed_main(void);
extern int main(void);
extern void exit(int arg); extern void exit(int arg);
static uint8_t low_level_init_needed; static uint8_t low_level_init_needed;
@ -721,6 +723,7 @@ void pre_main(void) {
if (low_level_init_needed) { if (low_level_init_needed) {
__iar_dynamic_initialization(); __iar_dynamic_initialization();
} }
mbed_main();
main(); main();
} }