From 1fa828fe7b35e49a77c232b5d95cc6cf7b429e85 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 3 Feb 2014 10:21:41 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6662 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/common/ports/ARMCMx/compilers/GCC/crt0.c | 4 ++-- os/common/ports/ARMCMx/compilers/GCC/vectors.c | 8 +++----- os/common/ports/ARMCMx/compilers/IAR/cstartup.s | 14 ++++++++++++++ os/common/ports/ARMCMx/compilers/IAR/vectors.s | 14 ++++++++++++++ os/common/ports/ARMCMx/compilers/RVCT/cstartup.s | 14 ++++++++++++++ os/common/ports/ARMCMx/compilers/RVCT/vectors.s | 14 ++++++++++++++ 6 files changed, 61 insertions(+), 7 deletions(-) (limited to 'os/common') diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0.c b/os/common/ports/ARMCMx/compilers/GCC/crt0.c index f115a0179..31437a35e 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/crt0.c +++ b/os/common/ports/ARMCMx/compilers/GCC/crt0.c @@ -19,8 +19,8 @@ */ /** - * @file GCC/crt0.c - * @brief Generic GCC ARMvx-M (Cortex-M0/M1/M3/M4) startup file. + * @file ARMCMx/GCC/crt0.c + * @brief Generic GCC Cortex-Mx startup file. * * @addtogroup ARMCMx_GCC_STARTUP * @{ diff --git a/os/common/ports/ARMCMx/compilers/GCC/vectors.c b/os/common/ports/ARMCMx/compilers/GCC/vectors.c index 0eb9d5d14..252071854 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/vectors.c +++ b/os/common/ports/ARMCMx/compilers/GCC/vectors.c @@ -19,12 +19,10 @@ */ /** - * @file GCC/ARMCMx/STM32F4xx/vectors.c - * @brief Interrupt vectors for the STM32F4xx family. + * @file ARMCMx/GCC/vectors.c + * @brief Interrupt vectors for Cortex-Mx devices. * - * @defgroup ARMCMx_STM32F4xx_VECTORS STM32F4xx Interrupt Vectors - * @ingroup ARMCMx_SPECIFIC - * @details Interrupt vectors for the STM32F4xx family. + * @defgroup ARMCMx_VECTORS Cortex-Mx Interrupt Vectors * @{ */ diff --git a/os/common/ports/ARMCMx/compilers/IAR/cstartup.s b/os/common/ports/ARMCMx/compilers/IAR/cstartup.s index 3ee52d0a1..b64f7e2a1 100644 --- a/os/common/ports/ARMCMx/compilers/IAR/cstartup.s +++ b/os/common/ports/ARMCMx/compilers/IAR/cstartup.s @@ -18,6 +18,16 @@ along with this program. If not, see . */ +/** + * @file ARMCMx/IAR/cstartup.s + * @brief Generic IAR Cortex-Mx startup file. + * + * @addtogroup ARMCMx_IAR_STARTUP + * @{ + */ + +#if !defined(__DOXYGEN__) + MODULE ?cstartup CONTROL_MODE_PRIVILEGED SET 0 @@ -66,3 +76,7 @@ __early_init: bx lr END + +#endif /* !defined(__DOXYGEN__) */ + +/**< @} */ diff --git a/os/common/ports/ARMCMx/compilers/IAR/vectors.s b/os/common/ports/ARMCMx/compilers/IAR/vectors.s index aef09656a..133f63217 100644 --- a/os/common/ports/ARMCMx/compilers/IAR/vectors.s +++ b/os/common/ports/ARMCMx/compilers/IAR/vectors.s @@ -18,9 +18,19 @@ along with this program. If not, see . */ +/** + * @file ARMCMx/IAR/vectors.c + * @brief Interrupt vectors for Cortex-Mx devices. + * + * @defgroup ARMCMx_IAR_VECTORS Cortex-Mx Interrupt Vectors + * @{ + */ + #define _FROM_ASM_ #include "cmparams.h" +#if !defined(__DOXYGEN__) + #if (CORTEX_NUM_VECTORS & 7) != 0 #error "the constant CORTEX_NUM_VECTORS must be a multiple of 8" #endif @@ -994,3 +1004,7 @@ _unhandled_exception b _unhandled_exception END + +#endif /* !defined(__DOXYGEN__) */ + +/**< @} */ diff --git a/os/common/ports/ARMCMx/compilers/RVCT/cstartup.s b/os/common/ports/ARMCMx/compilers/RVCT/cstartup.s index e0c6b85ee..aa97ca5ab 100644 --- a/os/common/ports/ARMCMx/compilers/RVCT/cstartup.s +++ b/os/common/ports/ARMCMx/compilers/RVCT/cstartup.s @@ -18,6 +18,16 @@ along with this program. If not, see . */ +/** + * @file ARMCMx/RVCT/cstartup.s + * @brief Generic RVCT Cortex-Mx startup file. + * + * @addtogroup ARMCMx_RVCT_STARTUP + * @{ + */ + +#if !defined(__DOXYGEN__) + ;/* <<< Use Configuration Wizard in Context Menu >>> */ ;// Main Stack Configuration (IRQ Stack) @@ -119,3 +129,7 @@ __user_initial_stackheap ENDIF END + +#endif /* !defined(__DOXYGEN__) */ + +/**< @} */ diff --git a/os/common/ports/ARMCMx/compilers/RVCT/vectors.s b/os/common/ports/ARMCMx/compilers/RVCT/vectors.s index 237f19052..03e4e6196 100644 --- a/os/common/ports/ARMCMx/compilers/RVCT/vectors.s +++ b/os/common/ports/ARMCMx/compilers/RVCT/vectors.s @@ -18,9 +18,19 @@ along with this program. If not, see . */ +/** + * @file ARMCMx/RVCT/vectors.c + * @brief Interrupt vectors for Cortex-Mx devices. + * + * @defgroup ARMCMx_RVCT_VECTORS Cortex-Mx Interrupt Vectors + * @{ + */ + #define _FROM_ASM_ #include "cmparams.h" +#if !defined(__DOXYGEN__) + #if (CORTEX_NUM_VECTORS & 7) != 0 #error "the constant CORTEX_NUM_VECTORS must be a multiple of 8" #endif @@ -990,3 +1000,7 @@ Vector3FC ENDP END + +#endif /* !defined(__DOXYGEN__) */ + +/**< @} */ -- cgit v1.2.3