[PATCH 06/21] rtems: Move internal structures to eventdata.h

[Sebastian Huber]

Update #3598.
---
 cpukit/headers.am                      |  1 +
 cpukit/include/rtems/rtems/event.h     | 23 ++++--------------
 cpukit/include/rtems/rtems/eventdata.h | 43 ++++++++++++++++++++++++++++++++++
 cpukit/include/rtems/rtems/eventimpl.h |  4 ++--
 cpukit/include/rtems/rtems/tasks.h     |  4 ++--
 5 files changed, 52 insertions(+), 23 deletions(-)
 create mode 100644 cpukit/include/rtems/rtems/eventdata.h

diff --git a/cpukit/headers.am b/cpukit/headers.am
index 26fa217049..765c835d3d 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -237,6 +237,7 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/dpmem.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/dpmemdata.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/dpmemimpl.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/event.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/eventdata.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/eventimpl.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/eventmp.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/intr.h
diff --git a/cpukit/include/rtems/rtems/event.h b/cpukit/include/rtems/rtems/event.h
index 0307fa4c8c..f37060a3f4 100644
--- a/cpukit/include/rtems/rtems/event.h
+++ b/cpukit/include/rtems/rtems/event.h
@@ -1,20 +1,9 @@
 /**
- * @file rtems/rtems/event.h
+ * @file
  *
- * @defgroup ClassicEvent Events
- *
- * @ingroup ClassicRTEMS
- * @brief Information Related to Event Manager
- *
- * This include file contains the information pertaining to the Event
- * Manager. This manager provides a high performance method of communication
- * and synchronization.
- *
- * Directives provided are:
- *
- * - send an event set to a task
- * - receive event condition
+ * @ingroup ClassicEvent
  *
+ * @brief Classic Event Manager API
  */
 
 /* COPYRIGHT (c) 1989-2008.
@@ -28,9 +17,9 @@
 #ifndef _RTEMS_RTEMS_EVENT_H
 #define _RTEMS_RTEMS_EVENT_H
 
+#include <rtems/rtems/options.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/types.h>
-#include <rtems/rtems/options.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -513,10 +502,6 @@ RTEMS_INLINE_ROUTINE void rtems_event_transient_clear( void )
 
 /** @} */
 
-typedef struct {
-  rtems_event_set pending_events;
-} Event_Control;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/cpukit/include/rtems/rtems/eventdata.h b/cpukit/include/rtems/rtems/eventdata.h
new file mode 100644
index 0000000000..16ff7a3981
--- /dev/null
+++ b/cpukit/include/rtems/rtems/eventdata.h
@@ -0,0 +1,43 @@
+/**
+ * @file
+ *
+ * @ingroup ClassicEventImpl
+ *
+ * @brief Classic Event Manager Data Structures
+ */
+
+/* COPYRIGHT (c) 1989-2008.
+ * 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_EVENTDATA_H
+#define _RTEMS_RTEMS_EVENTDATA_H
+
+#include <rtems/rtems/event.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup ClassicEventImpl
+ *
+ * @{
+ */
+
+typedef struct {
+  rtems_event_set pending_events;
+} Event_Control;
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* end of include file */
diff --git a/cpukit/include/rtems/rtems/eventimpl.h b/cpukit/include/rtems/rtems/eventimpl.h
index 933ea0fe2b..ae249ee7c7 100644
--- a/cpukit/include/rtems/rtems/eventimpl.h
+++ b/cpukit/include/rtems/rtems/eventimpl.h
@@ -3,7 +3,7 @@
  *
  * @ingroup ClassicEventImpl
  *
- * @brief Classic Event Implementation
+ * @brief Classic Event Manager Implementation
  */
 
 /*  COPYRIGHT (c) 1989-2008.
@@ -17,7 +17,7 @@
 #ifndef _RTEMS_RTEMS_EVENTIMPL_H
 #define _RTEMS_RTEMS_EVENTIMPL_H
 
-#include <rtems/rtems/event.h>
+#include <rtems/rtems/eventdata.h>
 #include <rtems/score/thread.h>
 
 #ifdef __cplusplus
diff --git a/cpukit/include/rtems/rtems/tasks.h b/cpukit/include/rtems/rtems/tasks.h
index 989008689b..10f8936a0f 100644
--- a/cpukit/include/rtems/rtems/tasks.h
+++ b/cpukit/include/rtems/rtems/tasks.h
@@ -40,11 +40,11 @@
 #include <rtems/score/object.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/thread.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/event.h>
 #include <rtems/rtems/asrdata.h>
 #include <rtems/rtems/attr.h>
+#include <rtems/rtems/eventdata.h>
 #include <rtems/rtems/status.h>
+#include <rtems/rtems/types.h>
 
 #ifdef __cplusplus
 extern "C" {
-- 
2.16.4