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 | 6 +++---
cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h | 2 +-
cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h | 12 ++++++++++++
cpukit/score/cpu/arm/include/rtems/score/paravirt.h | 20 ++++++--------------
10 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/cpukit/score/cpu/arm/arm_exc_abort.S
b/cpukit/score/cpu/arm/arm_exc_abort.S
index c044c0a47f..03f7963eac 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 5afd12d13c..ddcaf945b5 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 fe621a2192..07b9588afd 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 ea6306ac03..66f8ba6032 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 c868b45248..05e186f73c 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 f8a5470bfb..f753dd60ed 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 3737246f9a..e3e913abfc 100644
--- a/cpukit/score/cpu/arm/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpu.h
@@ -40,7 +40,7 @@
/**
* @defgroup ScoreCPUARM ARM Specific Support
*
- * @ingroup RTEMSScoreCPU
+ * @ingroup RTEMSScoreCPUARM
*
* @brief ARM specific support.
*/
@@ -96,7 +96,7 @@
#endif /* defined(ARM_MULTILIB_ARCH_V4) */
/**
- * @addtogroup RTEMSScoreCPU
+ * @addtogroup RTEMSScoreCPUARM
*/
/**@{**/
@@ -206,7 +206,7 @@ extern "C" {
#endif
/**
- * @addtogroup RTEMSScoreCPU
+ * @addtogroup RTEMSScoreCPUARM
*/
/**@{**/
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 c910ae6821..e25dd25f99 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 b856349db3..2c7078b790 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 08fb8a08ef..d0dc4024e2 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
--
2.16.4
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
