diff options
Diffstat (limited to '')
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/dpmem.h | 34 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/dpmemimpl.h (renamed from cpukit/rtems/inline/rtems/rtems/dpmem.inl) | 47 |
2 files changed, 41 insertions, 40 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/rtems/include/rtems/rtems/dpmem.h index aea8aea6a4..fd931c3f33 100644 --- a/cpukit/rtems/include/rtems/rtems/dpmem.h +++ b/cpukit/rtems/include/rtems/rtems/dpmem.h @@ -32,24 +32,13 @@ #ifndef _RTEMS_RTEMS_DPMEM_H #define _RTEMS_RTEMS_DPMEM_H -/** - * This constant is defined to extern most of the time when using - * this header file. However by defining it to nothing, the data - * declared in this header file can be instantiated. This is done - * in a single per manager file. - */ -#ifndef RTEMS_DPMEM_EXTERN -#define RTEMS_DPMEM_EXTERN extern -#endif +#include <rtems/rtems/types.h> +#include <rtems/rtems/status.h> #ifdef __cplusplus extern "C" { #endif -#include <rtems/score/object.h> -#include <rtems/rtems/support.h> -#include <rtems/rtems/status.h> - /** * @defgroup ClassicDPMEM Dual Ported Memory * @@ -77,19 +66,6 @@ typedef struct { } Dual_ported_memory_Control; /** - * @brief Define the internal Dual Ported Memory information - * The following define the internal Dual Ported Memory information. - */ -RTEMS_DPMEM_EXTERN Objects_Information _Dual_ported_memory_Information; - -/** - * @brief Dual Ported Memory Manager Initialization - * - * This routine performs the initialization necessary for this manager. - */ -void _Dual_ported_memory_Manager_initialization(void); - -/** * @brief Creates a port into a dual-ported memory area. * * This routine implements the rtems_port_create directive. The port @@ -193,15 +169,11 @@ rtems_status_code rtems_port_internal_to_external( void **external ); -#ifndef __RTEMS_APPLICATION__ -#include <rtems/rtems/dpmem.inl> -#endif +/**@}*/ #ifdef __cplusplus } #endif -/**@}*/ - #endif /* end of include file */ diff --git a/cpukit/rtems/inline/rtems/rtems/dpmem.inl b/cpukit/rtems/include/rtems/rtems/dpmemimpl.h index 19a4addbca..1fa636dc35 100644 --- a/cpukit/rtems/inline/rtems/rtems/dpmem.inl +++ b/cpukit/rtems/include/rtems/rtems/dpmemimpl.h @@ -1,8 +1,9 @@ /** - * @file rtems/rtems/dpmem.inl + * @file * - * This include file contains the inline routine used in conjunction - * with the Dual Ported Memory Manager + * @ingroup ClassicDPMEMImpl + * + * @brief Dual Ported Memory Manager Implementation */ /* COPYRIGHT (c) 1989-2008. @@ -13,17 +14,41 @@ * http://www.rtems.com/license/LICENSE. */ -#ifndef _RTEMS_RTEMS_DPMEM_H -# error "Never use <rtems/rtems/dpmem.inl> directly; include <rtems/rtems/dpmem.h> instead." -#endif - #ifndef _RTEMS_RTEMS_DPMEM_INL #define _RTEMS_RTEMS_DPMEM_INL +#include <rtems/rtems/dpmem.h> + +/** + * @defgroup ClassicDPMEMImpl Dual Ported Memory Manager Implementation + * + * @ingroup ClassicDPMEM + * + * @{ + */ + +/** + * This constant is defined to extern most of the time when using + * this header file. However by defining it to nothing, the data + * declared in this header file can be instantiated. This is done + * in a single per manager file. + */ +#ifndef RTEMS_DPMEM_EXTERN +#define RTEMS_DPMEM_EXTERN extern +#endif + +/** + * @brief Define the internal Dual Ported Memory information + * The following define the internal Dual Ported Memory information. + */ +RTEMS_DPMEM_EXTERN Objects_Information _Dual_ported_memory_Information; + /** - * @addtogroup ClassicDPMEM - * @{ + * @brief Dual Ported Memory Manager Initialization + * + * This routine performs the initialization necessary for this manager. */ +void _Dual_ported_memory_Manager_initialization(void); /** * @brief Allocates a port control block from the inactive chain @@ -86,5 +111,9 @@ RTEMS_INLINE_ROUTINE bool _Dual_ported_memory_Is_null( /**@}*/ +#ifdef __cplusplus +} +#endif + #endif /* end of include file */ |