From 257cf743a5c69f9dd302fe31d99978f84970ad64 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 8 Nov 2018 09:03:47 +0100
Subject: rtems: Move internal structures to asrdata.h

Update #3598.
---
 cpukit/headers.am                    |  1 +
 cpukit/include/rtems/rtems/asr.h     | 19 ------------
 cpukit/include/rtems/rtems/asrdata.h | 58 ++++++++++++++++++++++++++++++++++++
 cpukit/include/rtems/rtems/asrimpl.h |  2 +-
 cpukit/include/rtems/rtems/tasks.h   |  2 +-
 5 files changed, 61 insertions(+), 21 deletions(-)
 create mode 100644 cpukit/include/rtems/rtems/asrdata.h

diff --git a/cpukit/headers.am b/cpukit/headers.am
index 6e2b690cd5..6210ba9153 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -223,6 +223,7 @@ include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-link.h
 include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-mutex.h
 include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-trace.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/asrdata.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/asrimpl.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/attrimpl.h
diff --git a/cpukit/include/rtems/rtems/asr.h b/cpukit/include/rtems/rtems/asr.h
index edd5e2fe62..b2fa02ce9e 100644
--- a/cpukit/include/rtems/rtems/asr.h
+++ b/cpukit/include/rtems/rtems/asr.h
@@ -57,25 +57,6 @@ typedef rtems_asr ( *rtems_asr_entry )(
                  rtems_signal_set
              );
 
-/**
- *  The following defines the control structure used to manage
- *  signals.  Each thread has a copy of this record.
- */
-typedef struct {
-  /** This field indicates if are ASRs enabled currently. */
-  bool              is_enabled;
-  /** This field indicates if address of the signal handler function. */
-  rtems_asr_entry   handler;
-  /** This field indicates if the task mode the signal will run with. */
-  Modes_Control     mode_set;
-  /** This field indicates the signal set that is posted. */
-  rtems_signal_set  signals_posted;
-  /** This field indicates the signal set that is pending. */
-  rtems_signal_set  signals_pending;
-  /** This field indicates if nest level of signals being processed */
-  uint32_t          nest_level;
-}   ASR_Information;
-
 /*
  *  The following constants define the individual signals which may
  *  be used to compose a signal set.
diff --git a/cpukit/include/rtems/rtems/asrdata.h b/cpukit/include/rtems/rtems/asrdata.h
new file mode 100644
index 0000000000..1068bc2e48
--- /dev/null
+++ b/cpukit/include/rtems/rtems/asrdata.h
@@ -0,0 +1,58 @@
+/**
+ * @file
+ *
+ * @ingroup ClassicASRImpl
+ *
+ * @brief Classic ASR Data Structures
+ */
+
+/* COPYRIGHT (c) 1989-2013.
+ * 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_RTEMS_ASRDATA_H
+#define _RTEMS_RTEMS_ASRDATA_H
+
+#include <rtems/rtems/asr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup ClassicASRImpl
+ *
+ * @{
+ */
+
+/**
+ *  The following defines the control structure used to manage
+ *  signals.  Each thread has a copy of this record.
+ */
+typedef struct {
+  /** This field indicates if are ASRs enabled currently. */
+  bool              is_enabled;
+  /** This field indicates if address of the signal handler function. */
+  rtems_asr_entry   handler;
+  /** This field indicates if the task mode the signal will run with. */
+  Modes_Control     mode_set;
+  /** This field indicates the signal set that is posted. */
+  rtems_signal_set  signals_posted;
+  /** This field indicates the signal set that is pending. */
+  rtems_signal_set  signals_pending;
+  /** This field indicates if nest level of signals being processed */
+  uint32_t          nest_level;
+}   ASR_Information;
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* end of include file */
diff --git a/cpukit/include/rtems/rtems/asrimpl.h b/cpukit/include/rtems/rtems/asrimpl.h
index 141c34d4bb..38cc1e29c6 100644
--- a/cpukit/include/rtems/rtems/asrimpl.h
+++ b/cpukit/include/rtems/rtems/asrimpl.h
@@ -17,7 +17,7 @@
 #ifndef _RTEMS_RTEMS_ASRIMPL_H
 #define _RTEMS_RTEMS_ASRIMPL_H
 
-#include <rtems/rtems/asr.h>
+#include <rtems/rtems/asrdata.h>
 
 #include <string.h>
 
diff --git a/cpukit/include/rtems/rtems/tasks.h b/cpukit/include/rtems/rtems/tasks.h
index aaba8851df..989008689b 100644
--- a/cpukit/include/rtems/rtems/tasks.h
+++ b/cpukit/include/rtems/rtems/tasks.h
@@ -42,7 +42,7 @@
 #include <rtems/score/thread.h>
 #include <rtems/rtems/types.h>
 #include <rtems/rtems/event.h>
-#include <rtems/rtems/asr.h>
+#include <rtems/rtems/asrdata.h>
 #include <rtems/rtems/attr.h>
 #include <rtems/rtems/status.h>
 
-- 
cgit v1.2.3