From 2a6ece58eaac63be0baf6505c2de4785b5e5b0ed Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 22 May 2011 11:43:45 +0000 Subject: Updated GCC-ARM port. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2996 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/GCC/ARM/chcore.h | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'os/ports/GCC') diff --git a/os/ports/GCC/ARM/chcore.h b/os/ports/GCC/ARM/chcore.h index 5a36d82c8..20727ce23 100644 --- a/os/ports/GCC/ARM/chcore.h +++ b/os/ports/GCC/ARM/chcore.h @@ -62,7 +62,7 @@ * @brief If enabled allows the idle thread to enter a low power mode. */ #ifndef ARM_ENABLE_WFI_IDLE -#define ARM_ENABLE_WFI_IDLE FALSE +#define ARM_ENABLE_WFI_IDLE FALSE #endif /*===========================================================================*/ @@ -93,7 +93,7 @@ * - "ARM9". * . */ -#define CH_ARCHITECTURE_NAME "ARMx" +#define CH_ARCHITECTURE_NAME "ARMx" /** * @brief Name of the architecture variant (optional). @@ -103,19 +103,45 @@ * - "ARM9" * . */ -#define CH_CORE_VARIANT_NAME "ARMxy" +#define CH_CORE_VARIANT_NAME "ARMxy" + +/** + * @brief Port-specific information string. + * @note The value is for documentation only, the real value changes + * depending on the selected options, the possible values are: + * - "Pure ARM" + * - "Pure THUMB" + * - "Interworking" + * . + */ +#define CH_PORT_INFO "ARM|THUMB|Interworking" #elif ARM_CORE == ARM_CORE_ARM7TDMI #define CH_ARCHITECTURE_ARM7TDMI -#define CH_ARCHITECTURE_NAME "ARM7" -#define CH_CORE_VARIANT_NAME "ARM7TDMI" +#define CH_ARCHITECTURE_NAME "ARM7" +#define CH_CORE_VARIANT_NAME "ARM7TDMI" #elif ARM_MODEL == ARM_VARIANT_ARM9 #define CH_ARCHITECTURE_ARM9 -#define CH_ARCHITECTURE_NAME "ARM9" -#define CH_CORE_VARIANT_NAME "ARM9" +#define CH_ARCHITECTURE_NAME "ARM9" +#define CH_CORE_VARIANT_NAME "ARM9" #endif +#if THUMB_PRESENT +#if THUMB_NO_INTERWORKING +#define CH_PORT_INFO "Pure THUMB mode" +#else /* !THUMB_NO_INTERWORKING */ +#define CH_PORT_INFO "Interworking mode" +#endif /* !THUMB_NO_INTERWORKING */ +#else /* !THUMB_PRESENT */ +#define CH_PORT_INFO "Pure ARM mode" +#endif /* !THUMB_PRESENT */ + +/** + * @brief Name of the compiler supported by this port. + */ +#define CH_COMPILER_NAME "GCC "__VERSION__ + /*===========================================================================*/ /* Port implementation part (common). */ /*===========================================================================*/ -- cgit v1.2.3