andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2491 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2010-12-18 09:24:23 +00:00
parent 7aa43aee70
commit 1aad1a508f
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/ARMCM3-STM32F103-IAR/main.c
View File

@ -40,13 +40,10 @@ static msg_t Thread1(void *arg) {
* Entry point. * Entry point.
*/ */
int main(int argc, char **argv) { int main(int argc, char **argv) {
void hwinit1(void);
(void)argc; (void)argc;
(void)argv; (void)argv;
hwinit1();
/* /*
* Activates the serial driver 2 using the driver default configuration. * Activates the serial driver 2 using the driver default configuration.
*/ */

21
os/ports/IAR/ARMCMx/cstartup.s
View File

@ -39,10 +39,13 @@ CONTROL_USE_PSP SET 2
SECTION .intvec:CODE:NOROOT(3) SECTION .intvec:CODE:NOROOT(3)
PUBLIC __iar_program_start PUBLIC __iar_program_start
EXTERN __cmain EXTERN main
EXTERN _exit
EXTERN __vector_table EXTERN __vector_table
EXTWEAK __iar_init_core EXTWEAK __iar_init_core
EXTWEAK __iar_init_vfp EXTWEAK __iar_init_vfp
EXTWEAK __low_level_init
EXTWEAK __iar_data_init3
SECTION .text:CODE:REORDER(2) SECTION .text:CODE:REORDER(2)
THUMB THUMB
@ -56,12 +59,26 @@ __iar_program_start:
bl hwinit0 bl hwinit0
bl __iar_init_core bl __iar_init_core
bl __iar_init_vfp bl __iar_init_vfp
bl __cmain
; Replicated cmain.s here in order to insert the call to hwinit1.
bl __low_level_init
cmp r0, #0
beq.n _call_main
bl __iar_data_init3
_call_main:
bl hwinit1
bl main
bl _exit
PUBWEAK hwinit0 PUBWEAK hwinit0
hwinit0 hwinit0
bx lr bx lr
PUBWEAK hwinit1
hwinit1
bx lr
REQUIRE __vector_table REQUIRE __vector_table
END END