zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
gdisirio 2013-08-06 15:05:20 +00:00
parent 8a3e3223da
commit b5e0aff09d
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
View File

@ -19,10 +19,10 @@
*/ */
/** /**
* @file ARM/chcoreasm.s * @file ARMCMx/GCC/chcoreasm_v7m.s
* @brief ARM7/9 architecture port low level code. * @brief ARMv7-M architecture port low level code.
* *
* @addtogroup ARM_CORE * @addtogroup ARMCMx_CORE
* @{ * @{
*/ */
@ -39,12 +39,12 @@
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
.syntax unified .syntax unified
.cpu cortex-m4 .cpu cortex-m4
.fpu softvfp .fpu softvfp
.thumb .thumb
.text .text
/* /*
* Thread trampoline code. * Thread trampoline code.
@ -54,20 +54,20 @@
* register R5 contains the thread parameter. The function chThdExit() is * register R5 contains the thread parameter. The function chThdExit() is
* called on thread function return. * called on thread function return.
*/ */
.thumb_func .thumb_func
.globl _port_thread_start .globl _port_thread_start
_port_thread_start: _port_thread_start:
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK
bl dbg_check_unlock bl dbg_check_unlock
#endif #endif
#if CH_DBG_STATISTICS #if CH_DBG_STATISTICS
bl _stats_stop_measure_crit_thd bl _stats_stop_measure_crit_thd
#endif #endif
movs r3, #0 movs r3, #0
msr BASEPRI, r3 msr BASEPRI, r3
mov r0, r5 mov r0, r5
blx r4 blx r4
bl chThdExit bl chThdExit
#endif /* !defined(__DOXYGEN__) */ #endif /* !defined(__DOXYGEN__) */

2
os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk
View File

@ -4,7 +4,7 @@ PORTSRC = ${CHIBIOS}/os/kernel/ports/ARMCMx/chcore.c \
$(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/crt0.c \ $(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/crt0.c \
$(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/vectors.c \ $(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/vectors.c \
PORTASM = $(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/chcoreasm.s PORTASM = $(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/chcoreasm_v7m.s
PORTINC = ${CHIBIOS}/os/kernel/ports/ARMCMx \ PORTINC = ${CHIBIOS}/os/kernel/ports/ARMCMx \
${CHIBIOS}/os/kernel/ports/ARMCMx/GCC \ ${CHIBIOS}/os/kernel/ports/ARMCMx/GCC \