score: Move CPU_PER_CPU_CONTROL_SIZE

Move CPU_PER_CPU_CONTROL_SIZE and the optional CPU_Per_CPU_control to
<rtems/score/cpuimpl.h> to hide it from <rtems.h>.

2 files changed, 23 insertions, 23 deletions

diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
index 5950650f72..a32dc37346 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
@@ -361,14 +361,6 @@ extern "C" {
 #define CPU_MODES_INTERRUPT_MASK   0x00000001
 
 /**
- * @brief The size of the CPU specific per-CPU control.
- *
- * This define must be visible to assember files since it is used to derive
- * structure offsets.
- */
-#define CPU_PER_CPU_CONTROL_SIZE 0
-
-/**
  * @brief Maximum number of processors of all systems supported by this CPU
  * port.
  */
@@ -385,20 +377,6 @@ extern "C" {
 /* may need to put some structures here.  */
 
 /**
- * @brief The CPU specific per-CPU control.
- *
- * The CPU port can place here all state information that must be available and
- * maintained for each processor in the system.  This structure must contain at
- * least one field for C/C++ compatibility.  In GNU C empty structures have a
- * size of zero.  In C++ structures have a non-zero size.  In case
- * CPU_PER_CPU_CONTROL_SIZE is defined to zero, then this structure is not
- * used.
- */
-typedef struct {
-  /* CPU specific per-CPU state */
-} CPU_Per_CPU_control;
-
-/**
  * @defgroup CPUContext Processor Dependent Context Management
  *
  * From the highest level viewpoint, there are 2 types of context to save.
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h b/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h
index f1b03435ba..85214d7f6c 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015, 2016 embedded brains GmbH
+ * Copyright (c) 2013, 2016 embedded brains GmbH
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
@@ -17,6 +17,14 @@
 
 #include <rtems/score/cpu.h>
 
+/**
+ * @brief The size of the CPU specific per-CPU control.
+ *
+ * This define must be visible to assember files since it is used to derive
+ * structure offsets.
+ */
+#define CPU_PER_CPU_CONTROL_SIZE 0
+
 #ifndef ASM
 
 #ifdef __cplusplus
@@ -24,6 +32,20 @@ extern "C" {
 #endif
 
 /**
+ * @brief The CPU specific per-CPU control.
+ *
+ * The CPU port can place here all state information that must be available and
+ * maintained for each processor in the system.  This structure must contain at
+ * least one field for C/C++ compatibility.  In GNU C empty structures have a
+ * size of zero.  In C++ structures have a non-zero size.  In case
+ * CPU_PER_CPU_CONTROL_SIZE is defined to zero, then this structure is not
+ * used.
+ */
+typedef struct {
+  /* CPU specific per-CPU state */
+} CPU_Per_CPU_control;
+
+/**
  * @brief Special register pointing to the per-CPU control of the current
  * processor.
  *