diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-23 11:12:52 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-23 15:12:52 +0200 |
commit | 63d229d655f10dcce750478b36aa8d7846ad8756 (patch) | |
tree | 68c28177f2fa59eb8dc13f7ded150542b3289015 | |
parent | rtems: Create options implementation header (diff) | |
download | rtems-63d229d655f10dcce750478b36aa8d7846ad8756.tar.bz2 |
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.
29 files changed, 74 insertions, 65 deletions
diff --git a/cpukit/libmisc/monitor/mon-part.c b/cpukit/libmisc/monitor/mon-part.c index 19e2d1c266..84624c5e0b 100644 --- a/cpukit/libmisc/monitor/mon-part.c +++ b/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() */ diff --git a/cpukit/libmisc/monitor/mon-region.c b/cpukit/libmisc/monitor/mon-region.c index 99b98c833b..f6fdd02110 100644 --- a/cpukit/libmisc/monitor/mon-region.c +++ b/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() */ diff --git a/cpukit/libmisc/monitor/mon-sema.c b/cpukit/libmisc/monitor/mon-sema.c index b588ddc8ee..c8a2b16280 100644 --- a/cpukit/libmisc/monitor/mon-sema.c +++ b/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() */ diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 0c9d6d493a..78af7e9943 100644 --- a/cpukit/rtems/Makefile.am +++ b/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 diff --git a/cpukit/rtems/include/rtems/rtems/attr.h b/cpukit/rtems/include/rtems/rtems/attr.h index 4753e3acee..5fed4c53de 100644 --- a/cpukit/rtems/include/rtems/rtems/attr.h +++ b/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 */ diff --git a/cpukit/rtems/inline/rtems/rtems/attr.inl b/cpukit/rtems/include/rtems/rtems/attrimpl.h index 126259a067..4f06b16fd7 100644 --- a/cpukit/rtems/inline/rtems/rtems/attr.inl +++ b/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 */ diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am index dca0d8533e..bd59ac9861 100644 --- a/cpukit/rtems/preinstall.am +++ b/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 diff --git a/cpukit/rtems/src/barriercreate.c b/cpukit/rtems/src/barriercreate.c index 16721375cd..cba8802e9c 100644 --- a/cpukit/rtems/src/barriercreate.c +++ b/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> diff --git a/cpukit/rtems/src/msg.c b/cpukit/rtems/src/msg.c index 4515d9b220..fc37f0ee9e 100644 --- a/cpukit/rtems/src/msg.c +++ b/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> diff --git a/cpukit/rtems/src/msgqallocate.c b/cpukit/rtems/src/msgqallocate.c index 80f99a7715..775b248f56 100644 --- a/cpukit/rtems/src/msgqallocate.c +++ b/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> diff --git a/cpukit/rtems/src/msgqbroadcast.c b/cpukit/rtems/src/msgqbroadcast.c index 29ba7e0b8d..c455c96490 100644 --- a/cpukit/rtems/src/msgqbroadcast.c +++ b/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> diff --git a/cpukit/rtems/src/msgqcreate.c b/cpukit/rtems/src/msgqcreate.c index d1996f1fee..b3f6bb59d1 100644 --- a/cpukit/rtems/src/msgqcreate.c +++ b/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> diff --git a/cpukit/rtems/src/msgqdelete.c b/cpukit/rtems/src/msgqdelete.c index 3c77975803..1d26ad259b 100644 --- a/cpukit/rtems/src/msgqdelete.c +++ b/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> diff --git a/cpukit/rtems/src/msgqflush.c b/cpukit/rtems/src/msgqflush.c index 5d2bbb35a7..40428da7c9 100644 --- a/cpukit/rtems/src/msgqflush.c +++ b/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> diff --git a/cpukit/rtems/src/msgqgetnumberpending.c b/cpukit/rtems/src/msgqgetnumberpending.c index 2d5a56d13e..4ca825e733 100644 --- a/cpukit/rtems/src/msgqgetnumberpending.c +++ b/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> diff --git a/cpukit/rtems/src/msgqident.c b/cpukit/rtems/src/msgqident.c index d6b4cce577..381a553c1c 100644 --- a/cpukit/rtems/src/msgqident.c +++ b/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> diff --git a/cpukit/rtems/src/msgqreceive.c b/cpukit/rtems/src/msgqreceive.c index 7a1a90c7f7..1231b37bba 100644 --- a/cpukit/rtems/src/msgqreceive.c +++ b/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> diff --git a/cpukit/rtems/src/msgqsend.c b/cpukit/rtems/src/msgqsend.c index 7aea3da1a0..1fdaceb264 100644 --- a/cpukit/rtems/src/msgqsend.c +++ b/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> diff --git a/cpukit/rtems/src/msgqtranslatereturncode.c b/cpukit/rtems/src/msgqtranslatereturncode.c index ac58ca4f71..3b12f169e1 100644 --- a/cpukit/rtems/src/msgqtranslatereturncode.c +++ b/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> diff --git a/cpukit/rtems/src/msgqurgent.c b/cpukit/rtems/src/msgqurgent.c index d8641c37f9..ee0317b42a 100644 --- a/cpukit/rtems/src/msgqurgent.c +++ b/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> diff --git a/cpukit/rtems/src/regioncreate.c b/cpukit/rtems/src/regioncreate.c index 753835536a..cd1739325e 100644 --- a/cpukit/rtems/src/regioncreate.c +++ b/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> diff --git a/cpukit/rtems/src/sem.c b/cpukit/rtems/src/sem.c index 90404b705e..ff8a14ff13 100644 --- a/cpukit/rtems/src/sem.c +++ b/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> diff --git a/cpukit/rtems/src/semcreate.c b/cpukit/rtems/src/semcreate.c index 0b0e4fb625..697e00403f 100644 --- a/cpukit/rtems/src/semcreate.c +++ b/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> diff --git a/cpukit/rtems/src/semdelete.c b/cpukit/rtems/src/semdelete.c index 96b4bd7968..6131571e64 100644 --- a/cpukit/rtems/src/semdelete.c +++ b/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> diff --git a/cpukit/rtems/src/semflush.c b/cpukit/rtems/src/semflush.c index de82973c88..9b7c055a7d 100644 --- a/cpukit/rtems/src/semflush.c +++ b/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> diff --git a/cpukit/rtems/src/semident.c b/cpukit/rtems/src/semident.c index bdecff5c05..4d4812d2e6 100644 --- a/cpukit/rtems/src/semident.c +++ b/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> diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c index 8660bce79f..722da0e054 100644 --- a/cpukit/rtems/src/semobtain.c +++ b/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> diff --git a/cpukit/rtems/src/semrelease.c b/cpukit/rtems/src/semrelease.c index 3af1ff947a..7f2e294c00 100644 --- a/cpukit/rtems/src/semrelease.c +++ b/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> diff --git a/cpukit/rtems/src/taskcreate.c b/cpukit/rtems/src/taskcreate.c index 471990da0a..1b8d2cad09 100644 --- a/cpukit/rtems/src/taskcreate.c +++ b/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> |