From 7892ac0ca4757850713ba854cdd3a047d8f0ab47 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 18 Sep 2020 09:07:46 +0200
Subject: rtems: From <rtems.h> to <rtems/rtems/mp.h>

Move multiprocessing related definitions to <rtems/rtems/mp.h>.  This
makes <rtems.h> an include only header file.
---
 cpukit/include/rtems.h          | 25 -------------------------
 cpukit/include/rtems/rtems/mp.h | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/cpukit/include/rtems.h b/cpukit/include/rtems.h
index ff0cb69bcf..dc0472b233 100644
--- a/cpukit/include/rtems.h
+++ b/cpukit/include/rtems.h
@@ -24,7 +24,6 @@
  * 
  * @brief RTEMS Classic API definitions and modules.
  */
-/** @{ */
 
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/types.h>
@@ -57,29 +56,5 @@
 
 #include <rtems/rtems/support.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief An MPCI must support packets of at least this size.
- */
-#define RTEMS_MINIMUM_PACKET_SIZE  MP_PACKET_MINIMUM_PACKET_SIZE
-
-/**
- * @brief Defines the count of @c uint32_t numbers in a packet which must be
- * converted to native format in a heterogeneous system.
- *
- * In packets longer than this value, some of the extra data may be a user
- * message buffer which is not automatically endian swapped.
- */
-#define RTEMS_MINIMUN_HETERO_CONVERSION  MP_PACKET_MINIMUN_HETERO_CONVERSION
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
-
 #endif
 /* end of include file */
diff --git a/cpukit/include/rtems/rtems/mp.h b/cpukit/include/rtems/rtems/mp.h
index a3de1e6682..0ddeaf7d53 100644
--- a/cpukit/include/rtems/rtems/mp.h
+++ b/cpukit/include/rtems/rtems/mp.h
@@ -18,6 +18,8 @@
 #ifndef _RTEMS_RTEMS_MP_H
 #define _RTEMS_RTEMS_MP_H
 
+#include <rtems/score/mppkt.h>
+
 /**
  *  @defgroup ClassicMP Multiprocessing
  *
@@ -32,6 +34,20 @@
 extern "C" {
 #endif
 
+/**
+ * @brief An MPCI must support packets of at least this size.
+ */
+#define RTEMS_MINIMUM_PACKET_SIZE  MP_PACKET_MINIMUM_PACKET_SIZE
+
+/**
+ * @brief Defines the count of @c uint32_t numbers in a packet which must be
+ * converted to native format in a heterogeneous system.
+ *
+ * In packets longer than this value, some of the extra data may be a user
+ * message buffer which is not automatically endian swapped.
+ */
+#define RTEMS_MINIMUN_HETERO_CONVERSION  MP_PACKET_MINIMUN_HETERO_CONVERSION
+
 /**
  *  @brief RTEMS Multiprocessing Announce
  *
-- 
cgit v1.2.3