rtems: Create attr implementation header

Move implementation specific parts of attr.h and attr.inl into new
header file attrimpl.h.  The attr.h contains now only the application
visible API.

cpukit/libmisc/monitor/mon-part.c

@@ -8,7 +8,7 @@
 
 #include <rtems.h>
 #include "monitor.h"
-#include <rtems/rtems/attr.inl>
+#include <rtems/rtems/attrimpl.h>
 #include <stdio.h>
 #include <string.h>    /* memcpy() */
 

cpukit/libmisc/monitor/mon-region.c

@@ -8,7 +8,7 @@
 
 #include <rtems.h>
 #include "monitor.h"
-#include <rtems/rtems/attr.inl>
+#include <rtems/rtems/attrimpl.h>
 #include <stdio.h>
 #include <string.h>    /* memcpy() */
 

cpukit/libmisc/monitor/mon-sema.c

@@ -8,7 +8,7 @@
 
 #include <rtems.h>
 #include "monitor.h"
-#include <rtems/rtems/attr.inl>
+#include <rtems/rtems/attrimpl.h>
 #include <stdio.h>
 #include <string.h>    /* memcpy() */
 

cpukit/rtems/Makefile.am

@@ -16,6 +16,7 @@ include_rtems_rtems_HEADERS =
 
 include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/attrimpl.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/barrier.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/barrierimpl.h
 include_rtems_rtems_HEADERS += include/rtems/rtems/cache.h
@@ -63,7 +64,6 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/taskmp.h
 endif
 
 include_rtems_rtems_HEADERS += inline/rtems/rtems/asr.inl
-include_rtems_rtems_HEADERS += inline/rtems/rtems/attr.inl
 include_rtems_rtems_HEADERS += inline/rtems/rtems/dpmem.inl
 include_rtems_rtems_HEADERS += inline/rtems/rtems/event.inl
 include_rtems_rtems_HEADERS += inline/rtems/rtems/eventset.inl

cpukit/rtems/include/rtems/rtems/attr.h

@@ -21,6 +21,8 @@
 #ifndef _RTEMS_RTEMS_ATTR_H
 #define _RTEMS_RTEMS_ATTR_H
 
+#include <rtems/score/basedefs.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -165,37 +167,11 @@ typedef uint32_t   rtems_attribute;
  */
 #define RTEMS_SYSTEM_TASK             0x00008000
 
-/****************** Forced Attributes in Configuration ****************/
-
-/**
- *  This attribute constant indicates the attributes that are not
- *  supportable given the hardware configuration.
- */
-#if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
-#define ATTRIBUTES_NOT_SUPPORTED       0
-#else
-#define ATTRIBUTES_NOT_SUPPORTED       RTEMS_FLOATING_POINT
-#endif
-
-/**
- *  This attribute constant indicates the attributes that are
- *  required given the hardware configuration.
- */
-#if ( CPU_ALL_TASKS_ARE_FP == TRUE )
-#define ATTRIBUTES_REQUIRED            RTEMS_FLOATING_POINT
-#else
-#define ATTRIBUTES_REQUIRED            0
-#endif
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/attr.inl>
-#endif
+/**@}*/
 
 #ifdef __cplusplus
 }
 #endif
 
-/**@}*/
-
 #endif
 /* end of include file */

cpukit/rtems/include/rtems/rtems/attrimpl.h

@@ -1,8 +1,9 @@
 /**
- * @file rtems/rtems/attr.inl
+ * @file
  *
- *  This include file contains all of the inlined routines associated
- *  with attributes.
+ * @ingroup ClassicAttributesImpl
+ *
+ * @brief Classic Attributes Implementation
  */
 
 /*
@@ -14,20 +15,46 @@
  *  http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef _RTEMS_RTEMS_ATTR_H
-# error "Never use <rtems/rtems/attr.inl> directly; include <rtems/rtems/attr.h> instead."
-#endif
-
 #ifndef _RTEMS_RTEMS_ATTR_INL
 #define _RTEMS_RTEMS_ATTR_INL
 
-#include <rtems/score/basedefs.h> /* RTEMS_INLINE_ROUTINE */
+#include <rtems/rtems/attr.h>
+#include <rtems/score/cpu.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
- *  @addtogroup ClassicAttributes
- *  @{
+ * @defgroup ClassicAttributesImpl Classic Attributes Implementation
+ *
+ * @ingroup ClassicAttributes
+ *
+ * @{
  */
 
+/****************** Forced Attributes in Configuration ****************/
+
+/**
+ *  This attribute constant indicates the attributes that are not
+ *  supportable given the hardware configuration.
+ */
+#if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
+#define ATTRIBUTES_NOT_SUPPORTED       0
+#else
+#define ATTRIBUTES_NOT_SUPPORTED       RTEMS_FLOATING_POINT
+#endif
+
+/**
+ *  This attribute constant indicates the attributes that are
+ *  required given the hardware configuration.
+ */
+#if ( CPU_ALL_TASKS_ARE_FP == TRUE )
+#define ATTRIBUTES_REQUIRED            RTEMS_FLOATING_POINT
+#else
+#define ATTRIBUTES_REQUIRED            0
+#endif
+
 /**
  *  @brief Sets the requested new_attributes in the attribute_set passed in.
  *
@@ -201,5 +228,9 @@ RTEMS_INLINE_ROUTINE bool _Attributes_Is_system_task(
 
 /**@}*/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */

cpukit/rtems/preinstall.am

@@ -35,6 +35,10 @@ $(PROJECT_INCLUDE)/rtems/rtems/attr.h: include/rtems/rtems/attr.h $(PROJECT_INCL
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.h
 
+$(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h: include/rtems/rtems/attrimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h
+
 $(PROJECT_INCLUDE)/rtems/rtems/barrier.h: include/rtems/rtems/barrier.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/barrier.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/barrier.h
@@ -197,10 +201,6 @@ $(PROJECT_INCLUDE)/rtems/rtems/asr.inl: inline/rtems/rtems/asr.inl $(PROJECT_INC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/attr.inl: inline/rtems/rtems/attr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.inl
-
 $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl: inline/rtems/rtems/dpmem.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl

cpukit/rtems/src/barriercreate.c

@@ -21,7 +21,7 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/barrierimpl.h>

cpukit/rtems/src/msg.c

@@ -32,7 +32,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqallocate.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqbroadcast.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqcreate.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqdelete.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqflush.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqgetnumberpending.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqident.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/statusimpl.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqreceive.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/optionsimpl.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqsend.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqtranslatereturncode.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/msgqurgent.c

@@ -31,7 +31,7 @@
 #include <rtems/score/mpci.h>
 #endif
 #include <rtems/rtems/status.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/support.h>

cpukit/rtems/src/regioncreate.c

@@ -19,6 +19,7 @@
 #endif
 
 #include <rtems/system.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
 #include <rtems/score/object.h>

cpukit/rtems/src/sem.c

@@ -22,7 +22,7 @@
 #include <rtems/config.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/options.h>

cpukit/rtems/src/semcreate.c

@@ -21,7 +21,7 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/options.h>

cpukit/rtems/src/semdelete.c

@@ -21,7 +21,7 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/options.h>

cpukit/rtems/src/semflush.c

@@ -21,7 +21,7 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/options.h>

cpukit/rtems/src/semident.c

@@ -21,7 +21,7 @@
 #include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/options.h>

cpukit/rtems/src/semobtain.c

@@ -21,7 +21,7 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/optionsimpl.h>

cpukit/rtems/src/semrelease.c

@@ -36,7 +36,7 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/rtems/attr.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/options.h>

cpukit/rtems/src/taskcreate.c

@@ -20,6 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/config.h>
+#include <rtems/rtems/attrimpl.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/modes.h>