From b5e0aff09d6dd6d7335f5ea75b2edc9a08bf11c6 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 6 Aug 2013 15:05:20 +0000
Subject: git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6094
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 .../ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s     | 34 +++++++++++-----------
 os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk   |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s b/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
index 924a0b6d0..3d4920b01 100644
--- a/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
+++ b/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
@@ -19,10 +19,10 @@
 */
 
 /**
- * @file    ARM/chcoreasm.s
- * @brief   ARM7/9 architecture port low level code.
+ * @file    ARMCMx/GCC/chcoreasm_v7m.s
+ * @brief   ARMv7-M architecture port low level code.
  *
- * @addtogroup ARM_CORE
+ * @addtogroup ARMCMx_CORE
  * @{
  */
 
@@ -39,12 +39,12 @@
 
 #if !defined(__DOXYGEN__)
 
-                    .syntax unified
-                    .cpu cortex-m4
-                    .fpu softvfp
+                .syntax unified
+                .cpu cortex-m4
+                .fpu softvfp
 
-                    .thumb
-                    .text
+                .thumb
+                .text
 
 /*
  * Thread trampoline code.
@@ -54,20 +54,20 @@
  * register R5 contains the thread parameter. The function chThdExit() is
  * called on thread function return.
  */
-                    .thumb_func
-                    .globl _port_thread_start
+                .thumb_func
+                .globl _port_thread_start
 _port_thread_start:
 #if CH_DBG_SYSTEM_STATE_CHECK
-                    bl      dbg_check_unlock
+                bl      dbg_check_unlock
 #endif
 #if CH_DBG_STATISTICS
-                    bl      _stats_stop_measure_crit_thd
+                bl      _stats_stop_measure_crit_thd
 #endif
-                    movs    r3, #0
-                    msr     BASEPRI, r3
-                    mov     r0, r5
-                    blx     r4
-                    bl      chThdExit
+                movs    r3, #0
+                msr     BASEPRI, r3
+                mov     r0, r5
+                blx     r4
+                bl      chThdExit
 
 #endif /* !defined(__DOXYGEN__) */
 
diff --git a/os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk b/os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk
index a4a320bf8..b5836447b 100644
--- a/os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk
+++ b/os/kernel/ports/ARMCMx/devices/STM32F30x/port.mk
@@ -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/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 \
           ${CHIBIOS}/os/kernel/ports/ARMCMx/GCC \
-- 
cgit v1.2.3