[rtems commit] score: Add ARM CPU architecture group

Sebastian Huber sebh at rtems.org
Tue Mar 26 10:28:37 UTC 2019


Module:    rtems
Branch:    master
Commit:    abec398940e4117b30e51751752654ca3f8b90d0
Changeset: http://git.rtems.org/rtems/commit/?id=abec398940e4117b30e51751752654ca3f8b90d0

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Mar 25 10:42:52 2019 +0100

score: Add ARM CPU architecture group

Update #3706.

---

 cpukit/score/cpu/arm/arm_exc_abort.S               |  2 +-
 cpukit/score/cpu/arm/arm_exc_interrupt.S           |  2 +-
 cpukit/score/cpu/arm/cpu.c                         |  2 +-
 cpukit/score/cpu/arm/cpu_asm.S                     |  2 +-
 cpukit/score/cpu/arm/include/rtems/asm.h           |  4 +--
 cpukit/score/cpu/arm/include/rtems/score/arm.h     |  2 +-
 cpukit/score/cpu/arm/include/rtems/score/cpu.h     | 36 ++++------------------
 cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h |  2 +-
 cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h | 12 ++++++++
 .../score/cpu/arm/include/rtems/score/paravirt.h   | 20 ++++--------
 10 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/cpukit/score/cpu/arm/arm_exc_abort.S b/cpukit/score/cpu/arm/arm_exc_abort.S
index c044c0a..03f7963 100644
--- a/cpukit/score/cpu/arm/arm_exc_abort.S
+++ b/cpukit/score/cpu/arm/arm_exc_abort.S
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreCPU
+ * @ingroup RTEMSScoreCPUARM
  *
  * @brief ARM data and prefetch abort exception prologue and epilogue.
  */
diff --git a/cpukit/score/cpu/arm/arm_exc_interrupt.S b/cpukit/score/cpu/arm/arm_exc_interrupt.S
index 5afd12d..ddcaf94 100644
--- a/cpukit/score/cpu/arm/arm_exc_interrupt.S
+++ b/cpukit/score/cpu/arm/arm_exc_interrupt.S
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreCPU
+ * @ingroup RTEMSScoreCPUARM
  *
  * @brief ARM interrupt exception prologue and epilogue.
  */
diff --git a/cpukit/score/cpu/arm/cpu.c b/cpukit/score/cpu/arm/cpu.c
index fe621a2..07b9588 100644
--- a/cpukit/score/cpu/arm/cpu.c
+++ b/cpukit/score/cpu/arm/cpu.c
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreCPU
+ * @ingroup RTEMSScoreCPUARM
  *
  * @brief ARM architecture support implementation.
  */
diff --git a/cpukit/score/cpu/arm/cpu_asm.S b/cpukit/score/cpu/arm/cpu_asm.S
index ea6306a..66f8ba6 100644
--- a/cpukit/score/cpu/arm/cpu_asm.S
+++ b/cpukit/score/cpu/arm/cpu_asm.S
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreCPU
+ * @ingroup RTEMSScoreCPUARM
  *
  * @brief ARM architecture support implementation.
  */
diff --git a/cpukit/score/cpu/arm/include/rtems/asm.h b/cpukit/score/cpu/arm/include/rtems/asm.h
index c868b45..05e186f 100644
--- a/cpukit/score/cpu/arm/include/rtems/asm.h
+++ b/cpukit/score/cpu/arm/include/rtems/asm.h
@@ -44,9 +44,9 @@
 #include <rtems/score/percpu.h>
 
 /**
- * @defgroup ScoreCPUARMASM ARM Assembler Support
+ * @defgroup RTEMSScoreCPUARMASM ARM Assembler Support
  *
- * @ingroup RTEMSScoreCPU
+ * @ingroup RTEMSScoreCPUARM
  *
  * @brief ARM Assembler Support
  */
diff --git a/cpukit/score/cpu/arm/include/rtems/score/arm.h b/cpukit/score/cpu/arm/include/rtems/score/arm.h
index f8a5470..f753dd6 100644
--- a/cpukit/score/cpu/arm/include/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/arm.h
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup RTEMSScoreCPU
+ * @addtogroup RTEMSScoreCPUARM
  */
 /**@{**/
 
diff --git a/cpukit/score/cpu/arm/include/rtems/score/cpu.h b/cpukit/score/cpu/arm/include/rtems/score/cpu.h
index 3737246..a537a4a 100644
--- a/cpukit/score/cpu/arm/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpu.h
@@ -35,16 +35,13 @@
 #endif
 #include <rtems/score/arm.h>
 
-#if defined(ARM_MULTILIB_ARCH_V4)
-
 /**
- * @defgroup ScoreCPUARM ARM Specific Support
+ * @addtogroup RTEMSScoreCPUARM
  *
- * @ingroup RTEMSScoreCPU
- *
- * @brief ARM specific support.
+ * @{
  */
-/**@{**/
+
+#if defined(ARM_MULTILIB_ARCH_V4)
 
 #if defined(__thumb__) && !defined(__thumb2__)
   #define ARM_SWITCH_REGISTERS uint32_t arm_switch_reg
@@ -91,15 +88,8 @@
 
 /** @} */
 
-/** @} */
-
 #endif /* defined(ARM_MULTILIB_ARCH_V4) */
 
-/**
- * @addtogroup RTEMSScoreCPU
- */
-/**@{**/
-
 /*
  *  The ARM uses the PIC interrupt model.
  */
@@ -167,8 +157,6 @@
 
 #define CPU_MAXIMUM_PROCESSORS 32
 
-/** @} */
-
 #ifdef ARM_MULTILIB_HAS_THREAD_ID_REGISTER
   #define ARM_CONTEXT_CONTROL_THREAD_ID_OFFSET 44
 #endif
@@ -205,11 +193,6 @@
 extern "C" {
 #endif
 
-/**
- * @addtogroup RTEMSScoreCPU
- */
-/**@{**/
-
 typedef struct {
 #if defined(ARM_MULTILIB_ARCH_V4)
   uint32_t register_r4;
@@ -595,13 +578,6 @@ static inline CPU_Counter_ticks _CPU_Counter_difference(
 
 void *_CPU_Thread_Idle_body( uintptr_t ignored );
 
-/** @} */
-
-/**
- * @addtogroup ScoreCPUARM
- */
-/**@{**/
-
 #if defined(ARM_MULTILIB_ARCH_V4)
 
 typedef enum {
@@ -688,8 +664,6 @@ void _CPU_Exception_frame_print( const CPU_Exception_frame *frame );
 
 void _ARM_Exception_default( CPU_Exception_frame *frame );
 
-/** @} */
-
 /** Type that can store a 32-bit integer or a pointer. */
 typedef uintptr_t CPU_Uint32ptr;
 
@@ -699,4 +673,6 @@ typedef uintptr_t CPU_Uint32ptr;
 
 #endif /* ASM */
 
+/** @} */
+
 #endif /* _RTEMS_SCORE_CPU_H */
diff --git a/cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h b/cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h
index c910ae6..e25dd25 100644
--- a/cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h
@@ -1,7 +1,7 @@
 /**
  * @file
  *
- * @ingroup RTEMSScoreCPU
+ * @ingroup RTEMSScoreCPUARM
  *
  * @brief ARM Assembler Support API
  */
diff --git a/cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h b/cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h
index b856349..2c7078b 100644
--- a/cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h
@@ -17,6 +17,16 @@
 
 #include <rtems/score/cpu.h>
 
+/**
+ * @defgroup RTEMSScoreCPUARM ARM
+ *
+ * @ingroup RTEMSScoreCPU
+ *
+ * @brief ARM Architecture Support
+ *
+ * @{
+ */
+
 #define CPU_PER_CPU_CONTROL_SIZE 0
 
 #ifdef ARM_MULTILIB_ARCH_V4
@@ -122,4 +132,6 @@ RTEMS_INLINE_ROUTINE void _CPU_Instruction_no_operation( void )
 
 #endif /* ASM */
 
+/** @} */
+
 #endif /* _RTEMS_SCORE_CPUIMPL_H */
diff --git a/cpukit/score/cpu/arm/include/rtems/score/paravirt.h b/cpukit/score/cpu/arm/include/rtems/score/paravirt.h
index 08fb8a0..d0dc402 100644
--- a/cpukit/score/cpu/arm/include/rtems/score/paravirt.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/paravirt.h
@@ -25,9 +25,9 @@
 #define _RTEMS_SCORE_PARAVIRT_H
 
 /**
- * @defgroup ParavirtARM Paravirtualization ARM Support
+ * @defgroup RTEMSScoreCPUARMParavirt ARM Paravirtualization Support
  *
- * @ingroup Score
+ * @ingroup RTEMSScoreCPUARM
  *
  * This handler encapulates the functionality (primarily conditional
  * feature defines) related to paravirtualization on the ARM.
@@ -38,20 +38,10 @@
  *   - Interrupt enable/disable support using the MSR must be disabled
  *     and replaced with BSP provided methods which are adapted to the
  *     hosting environment.
+ *
+ * @{
  */
 
-#ifndef ASM
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* !ASM */
-
 /**
  * In a paravirtualized environment, RTEMS executes in user space
  * and cannot disable/enable external exceptions (e.g. interrupts).
@@ -72,4 +62,6 @@ extern "C" {
  */
 #define ARM_DISABLE_THREAD_ID_REGISTER_USE
 
+/** @} */
+
 #endif



More information about the vc mailing list