From 4faf6433bb01a222e21ead6727b0d43b24600552 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 8 Sep 2010 08:58:54 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2168 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/GCC/ARMCMx/chcore.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'os/ports/GCC/ARMCMx/chcore.h') diff --git a/os/ports/GCC/ARMCMx/chcore.h b/os/ports/GCC/ARMCMx/chcore.h index c0396c1d5..ae3ec2b8e 100644 --- a/os/ports/GCC/ARMCMx/chcore.h +++ b/os/ports/GCC/ARMCMx/chcore.h @@ -187,18 +187,37 @@ #if defined(__DOXYGEN__) /** * @brief Macro defining the specific ARM architecture. + * @note This macro is for documentation only, the real name changes + * depending on the selected architecture, the possible names are: + * - CH_ARCHITECTURE_ARM_v6M. + * - CH_ARCHITECTURE_ARM_v7M. + * . */ #define CH_ARCHITECTURE_ARM_vxm /** * @brief Name of the implemented architecture. + * @note The value is for documentation only, the real value changes + * depending on the selected architecture, the possible values are: + * - "ARMv6-M". + * - "ARMv7-M". + * - "ARMv7-ME". + * . */ #define CH_ARCHITECTURE_NAME "ARMvx-M" /** * @brief Name of the architecture variant (optional). + * @note The value is for documentation only, the real value changes + * depending on the selected architecture, the possible values are: + * - "Cortex-M0" + * - "Cortex-M1" + * - "Cortex-M3" + * - "Cortex-M4" + * . */ #define CH_CORE_VARIANT_NAME "Cortex-Mx" + #elif CORTEX_MODEL == CORTEX_M4 #define CH_ARCHITECTURE_ARM_v7M #define CH_ARCHITECTURE_NAME "ARMv7-ME" @@ -225,7 +244,12 @@ * @brief Stack and memory alignment enforcement. */ #if (CORTEX_STACK_ALIGNMENT == 64) || defined(__DOXYGEN__) +#if defined(__DOXYGEN__) +/* Dummy declaration, for Doxygen only.*/ +typedef uint64_t stkalign_t; +#else typedef uint64_t stkalign_t __attribute__ ((aligned (8))); +#endif #elif CORTEX_STACK_ALIGNMENT == 32 typedef uint32_t stkalign_t __attribute__ ((aligned (4))); #else -- cgit v1.2.3