From 963c6c2ac467705410aa86a0276a00ece716789a Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 12 Nov 2018 09:28:49 +0100
Subject: score: Move internal structures to userextdata.h

Update #3598.
---
 cpukit/headers.am                        |  1 +
 cpukit/include/rtems/extensiondata.h     |  1 +
 cpukit/include/rtems/score/userext.h     | 23 ------------
 cpukit/include/rtems/score/userextdata.h | 63 ++++++++++++++++++++++++++++++++
 cpukit/include/rtems/score/userextimpl.h |  2 +-
 5 files changed, 66 insertions(+), 24 deletions(-)
 create mode 100644 cpukit/include/rtems/score/userextdata.h

diff --git a/cpukit/headers.am b/cpukit/headers.am
index a3183496be..d74fe788f9 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -393,6 +393,7 @@ include_rtems_score_HEADERS += include/rtems/score/timestamp.h
 include_rtems_score_HEADERS += include/rtems/score/tls.h
 include_rtems_score_HEADERS += include/rtems/score/todimpl.h
 include_rtems_score_HEADERS += include/rtems/score/userext.h
+include_rtems_score_HEADERS += include/rtems/score/userextdata.h
 include_rtems_score_HEADERS += include/rtems/score/userextimpl.h
 include_rtems_score_HEADERS += include/rtems/score/watchdog.h
 include_rtems_score_HEADERS += include/rtems/score/watchdogimpl.h
diff --git a/cpukit/include/rtems/extensiondata.h b/cpukit/include/rtems/extensiondata.h
index 4c3be8a5a2..e665fda04f 100644
--- a/cpukit/include/rtems/extensiondata.h
+++ b/cpukit/include/rtems/extensiondata.h
@@ -20,6 +20,7 @@
 
 #include <rtems/extension.h>
 #include <rtems/score/objectdata.h>
+#include <rtems/score/userextdata.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/include/rtems/score/userext.h b/cpukit/include/rtems/score/userext.h
index 7b80227f37..216b795f86 100644
--- a/cpukit/include/rtems/score/userext.h
+++ b/cpukit/include/rtems/score/userext.h
@@ -19,7 +19,6 @@
 #define _RTEMS_SCORE_USEREXT_H
 
 #include <rtems/score/interr.h>
-#include <rtems/score/chain.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -242,28 +241,6 @@ typedef struct {
   User_extensions_thread_terminate_extension thread_terminate;
 }   User_extensions_Table;
 
-/**
- * @brief Manages the switch callouts.
- *
- * They are managed separately from other extensions for performance reasons.
- */
-typedef struct {
-  Chain_Node                              Node;
-  User_extensions_thread_switch_extension thread_switch;
-}   User_extensions_Switch_control;
-
-/**
- * @brief Manages each user extension set.
- *
- * The switch control is part of the extensions control even if not used due to
- * the extension not having a switch handler.
- */
-typedef struct {
-  Chain_Node                     Node;
-  User_extensions_Switch_control Switch;
-  User_extensions_Table          Callouts;
-}   User_extensions_Control;
-
 /** @} */
 
 #ifdef __cplusplus
diff --git a/cpukit/include/rtems/score/userextdata.h b/cpukit/include/rtems/score/userextdata.h
new file mode 100644
index 0000000000..100ae21647
--- /dev/null
+++ b/cpukit/include/rtems/score/userextdata.h
@@ -0,0 +1,63 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler Data Structures
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2009.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.org/license/LICENSE.
+ */
+
+#ifndef _RTEMS_SCORE_USEREXTDATA_H
+#define _RTEMS_SCORE_USEREXTDATA_H
+
+#include <rtems/score/userext.h>
+#include <rtems/score/chain.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup ScoreUserExt
+ *
+ * @{
+ */
+
+/**
+ * @brief Manages the switch callouts.
+ *
+ * They are managed separately from other extensions for performance reasons.
+ */
+typedef struct {
+  Chain_Node                              Node;
+  User_extensions_thread_switch_extension thread_switch;
+}   User_extensions_Switch_control;
+
+/**
+ * @brief Manages each user extension set.
+ *
+ * The switch control is part of the extensions control even if not used due to
+ * the extension not having a switch handler.
+ */
+typedef struct {
+  Chain_Node                     Node;
+  User_extensions_Switch_control Switch;
+  User_extensions_Table          Callouts;
+}   User_extensions_Control;
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* end of include file */
diff --git a/cpukit/include/rtems/score/userextimpl.h b/cpukit/include/rtems/score/userextimpl.h
index a842ae8e86..77486598c4 100644
--- a/cpukit/include/rtems/score/userextimpl.h
+++ b/cpukit/include/rtems/score/userextimpl.h
@@ -18,7 +18,7 @@
 #ifndef _RTEMS_SCORE_USEREXTIMPL_H
 #define _RTEMS_SCORE_USEREXTIMPL_H
 
-#include <rtems/score/userext.h>
+#include <rtems/score/userextdata.h>
 #include <rtems/score/chainimpl.h>
 #include <rtems/score/isrlock.h>
 #include <rtems/score/thread.h>
-- 
cgit v1.2.3