[rtems commit] rtems: Create region implementation header
Sebastian Huber
sebh at rtems.org
Tue Jul 23 13:09:30 UTC 2013
Module: rtems
Branch: master
Commit: f6c7c57d86b58e12d372495a23e331cb81ea59ff
Changeset: http://git.rtems.org/rtems/commit/?id=f6c7c57d86b58e12d372495a23e331cb81ea59ff
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Jul 23 14:38:19 2013 +0200
rtems: Create region implementation header
Move implementation specific parts of region.h and region.inl into new
header file regionimpl.h. The region.h contains now only the
application visible API.
---
cpukit/libcsupport/src/resource_snapshot.c | 1 +
cpukit/libmisc/monitor/mon-object.c | 1 +
cpukit/rtems/Makefile.am | 2 +-
cpukit/rtems/include/rtems/rtems/region.h | 85 +----------
cpukit/rtems/include/rtems/rtems/regionimpl.h | 188 +++++++++++++++++++++++++
cpukit/rtems/include/rtems/rtems/regionmp.h | 9 +-
cpukit/rtems/inline/rtems/rtems/region.inl | 118 ----------------
cpukit/rtems/preinstall.am | 8 +-
cpukit/rtems/src/region.c | 2 +-
cpukit/rtems/src/regioncreate.c | 2 +-
cpukit/rtems/src/regiondata.c | 3 +-
cpukit/rtems/src/regiondelete.c | 2 +-
cpukit/rtems/src/regionextend.c | 2 +-
cpukit/rtems/src/regiongetfreeinfo.c | 2 +-
cpukit/rtems/src/regiongetinfo.c | 2 +-
cpukit/rtems/src/regiongetsegment.c | 2 +-
cpukit/rtems/src/regiongetsegmentsize.c | 2 +-
cpukit/rtems/src/regionident.c | 2 +-
cpukit/rtems/src/regionmp.c | 2 +-
cpukit/rtems/src/regionprocessqueue.c | 2 +-
cpukit/rtems/src/regionresizesegment.c | 2 +-
cpukit/rtems/src/regionreturnsegment.c | 2 +-
cpukit/sapi/src/rtemsapi.c | 2 +-
testsuites/sptests/spsize/size.c | 4 +-
24 files changed, 224 insertions(+), 223 deletions(-)
diff --git a/cpukit/libcsupport/src/resource_snapshot.c b/cpukit/libcsupport/src/resource_snapshot.c
index 0fd20ae..b71b198 100644
--- a/cpukit/libcsupport/src/resource_snapshot.c
+++ b/cpukit/libcsupport/src/resource_snapshot.c
@@ -32,6 +32,7 @@
#include <rtems/rtems/messageimpl.h>
#include <rtems/rtems/partimpl.h>
#include <rtems/rtems/ratemonimpl.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/rtems/semimpl.h>
#include <rtems/rtems/timerimpl.h>
diff --git a/cpukit/libmisc/monitor/mon-object.c b/cpukit/libmisc/monitor/mon-object.c
index cb0ffa1..54ae207 100644
--- a/cpukit/libmisc/monitor/mon-object.c
+++ b/cpukit/libmisc/monitor/mon-object.c
@@ -23,6 +23,7 @@
#include <rtems/extensionimpl.h>
#include <rtems/rtems/messageimpl.h>
#include <rtems/rtems/partimpl.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/rtems/semimpl.h>
#if defined(RTEMS_POSIX_API)
#include <rtems/posix/pthreadimpl.h>
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index 7e810af..7633932 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -40,6 +40,7 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/partimpl.h
include_rtems_rtems_HEADERS += include/rtems/rtems/ratemon.h
include_rtems_rtems_HEADERS += include/rtems/rtems/ratemonimpl.h
include_rtems_rtems_HEADERS += include/rtems/rtems/region.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/regionimpl.h
include_rtems_rtems_HEADERS += include/rtems/rtems/rtemsapi.h
include_rtems_rtems_HEADERS += include/rtems/rtems/sem.h
include_rtems_rtems_HEADERS += include/rtems/rtems/semimpl.h
@@ -69,7 +70,6 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/signalmp.h
include_rtems_rtems_HEADERS += include/rtems/rtems/taskmp.h
endif
-include_rtems_rtems_HEADERS += inline/rtems/rtems/region.inl
include_rtems_rtems_HEADERS += inline/rtems/rtems/tasks.inl
## src
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h
index a99a497..ce471b8 100644
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ b/cpukit/rtems/include/rtems/rtems/region.h
@@ -30,15 +30,16 @@
#ifndef _RTEMS_RTEMS_REGION_H
#define _RTEMS_RTEMS_REGION_H
-#include <rtems/score/object.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/heap.h>
-#include <rtems/debug.h>
#include <rtems/rtems/attr.h>
#include <rtems/rtems/options.h>
#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
#include <rtems/rtems/types.h>
+#include <rtems/score/heap.h>
+#include <rtems/score/tqdata.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/**
* @defgroup ClassicRegion Regions
@@ -50,24 +51,6 @@
/**@{*/
/**
- * @brief Instantiate RTEMS Region Data
- *
- * Region Manager -- Instantiate Data
- *
- * 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_REGION_EXTERN
-#define RTEMS_REGION_EXTERN extern
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
* The following records define the control block used to manage
* each region.
*/
@@ -85,21 +68,6 @@ typedef struct {
} Region_Control;
/**
- * The following defines the information control block used to
- * manage this class of objects.
- */
-RTEMS_REGION_EXTERN Objects_Information _Region_Information;
-
-/**
- * @brief _Region_Manager_initialization
- *
- * Region Manager
- *
- * This routine performs the initialization necessary for this manager.
- */
-void _Region_Manager_initialization(void);
-
-/**
* @brief rtems_region_create
*
* Region Manager
@@ -322,50 +290,11 @@ rtems_status_code rtems_region_resize_segment(
uintptr_t *old_size
);
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/rtems/region.inl>
-/**
- * @brief Process Region Queue
- *
- * This is a helper routine which is invoked any time memory is
- * freed. It looks at the set of waiting tasks and attempts to
- * satisfy all outstanding requests.
- *
- * @param[in] the_region is the the region
- */
-extern void _Region_Process_queue(Region_Control *the_region);
-
-#endif
-
-#if defined(RTEMS_MULTIPROCESSING)
-#include <rtems/rtems/regionmp.h>
-#endif
-
-/**
- * @brief _Region_Debug_Walk
- *
- * This routine is invoked to verify the integrity of a heap associated
- * with the_region.
- */
-#ifdef RTEMS_DEBUG
-
-#define _Region_Debug_Walk( _the_region, _source ) \
- do { \
- if ( rtems_debug_is_enabled( RTEMS_DEBUG_REGION ) ) \
- _Heap_Walk( &(_the_region)->Memory, _source, false ); \
- } while ( 0 )
-
-#else
-
-#define _Region_Debug_Walk( _the_region, _source )
-
-#endif
+/**@}*/
#ifdef __cplusplus
}
#endif
-/**@}*/
-
#endif
/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/regionimpl.h b/cpukit/rtems/include/rtems/rtems/regionimpl.h
new file mode 100644
index 0000000..ad2cacb
--- /dev/null
+++ b/cpukit/rtems/include/rtems/rtems/regionimpl.h
@@ -0,0 +1,188 @@
+/**
+ * @file
+ *
+ * @ingroup ClassicRegionImpl
+ *
+ * @brief Classic Region Manager Implementation
+ */
+
+/* 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.com/license/LICENSE.
+ */
+
+#ifndef _RTEMS_RTEMS_REGIONIMPL_H
+#define _RTEMS_RTEMS_REGIONIMPL_H
+
+#include <rtems/rtems/region.h>
+#include <rtems/debug.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup ClassicRegionImpl Classic Region Manager Implementation
+ *
+ * @ingroup ClassicRegion
+ *
+ * @{
+ */
+
+/**
+ * @brief Instantiate RTEMS Region Data
+ *
+ * Region Manager -- Instantiate Data
+ *
+ * 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_REGION_EXTERN
+#define RTEMS_REGION_EXTERN extern
+#endif
+
+/**
+ * The following defines the information control block used to
+ * manage this class of objects.
+ */
+RTEMS_REGION_EXTERN Objects_Information _Region_Information;
+
+/**
+ * @brief _Region_Manager_initialization
+ *
+ * Region Manager
+ *
+ * This routine performs the initialization necessary for this manager.
+ */
+void _Region_Manager_initialization(void);
+
+/**
+ * @brief Region_Allocate
+ *
+ * This function allocates a region control block from
+ * the inactive chain of free region control blocks.
+ */
+RTEMS_INLINE_ROUTINE Region_Control *_Region_Allocate( void )
+{
+ return (Region_Control *) _Objects_Allocate( &_Region_Information );
+}
+
+/**
+ * @brief Region_Free
+ *
+ * This routine frees a region control block to the
+ * inactive chain of free region control blocks.
+ */
+RTEMS_INLINE_ROUTINE void _Region_Free (
+ Region_Control *the_region
+)
+{
+ _Objects_Free( &_Region_Information, &the_region->Object );
+}
+
+/**
+ * @brief Region_Get
+ *
+ * This function maps region IDs to region control blocks.
+ * If ID corresponds to a local region, then it returns
+ * the_region control pointer which maps to ID and location
+ * is set to OBJECTS_LOCAL. Otherwise, location is set
+ * to OBJECTS_ERROR and the_region is undefined.
+ */
+RTEMS_INLINE_ROUTINE Region_Control *_Region_Get (
+ Objects_Id id,
+ Objects_Locations *location
+)
+{
+ return (Region_Control *)
+ _Objects_Get_no_protection( &_Region_Information, id, location );
+}
+
+/**
+ * @brief Region_Allocate_segment
+ *
+ * This function attempts to allocate a segment from the_region.
+ * If successful, it returns the address of the allocated segment.
+ * Otherwise, it returns NULL.
+ */
+RTEMS_INLINE_ROUTINE void *_Region_Allocate_segment (
+ Region_Control *the_region,
+ uintptr_t size
+)
+{
+ return _Heap_Allocate( &the_region->Memory, size );
+}
+
+/**
+ * @brief Region_Free_segment
+ *
+ * This function frees the_segment to the_region.
+ */
+RTEMS_INLINE_ROUTINE bool _Region_Free_segment (
+ Region_Control *the_region,
+ void *the_segment
+)
+{
+ return _Heap_Free( &the_region->Memory, the_segment );
+}
+
+/**
+ * @brief Region_Is_null
+ *
+ * This function returns TRUE if the_region is NULL and FALSE otherwise.
+ */
+RTEMS_INLINE_ROUTINE bool _Region_Is_null (
+ Region_Control *the_region
+)
+{
+ return ( the_region == NULL );
+}
+
+/**
+ * @brief Process Region Queue
+ *
+ * This is a helper routine which is invoked any time memory is
+ * freed. It looks at the set of waiting tasks and attempts to
+ * satisfy all outstanding requests.
+ *
+ * @param[in] the_region is the the region
+ */
+extern void _Region_Process_queue(Region_Control *the_region);
+
+/**
+ * @brief _Region_Debug_Walk
+ *
+ * This routine is invoked to verify the integrity of a heap associated
+ * with the_region.
+ */
+#ifdef RTEMS_DEBUG
+
+#define _Region_Debug_Walk( _the_region, _source ) \
+ do { \
+ if ( rtems_debug_is_enabled( RTEMS_DEBUG_REGION ) ) \
+ _Heap_Walk( &(_the_region)->Memory, _source, false ); \
+ } while ( 0 )
+
+#else
+
+#define _Region_Debug_Walk( _the_region, _source )
+
+#endif
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(RTEMS_MULTIPROCESSING)
+#include <rtems/rtems/regionmp.h>
+#endif
+
+#endif
+/* end of include file */
diff --git a/cpukit/rtems/include/rtems/rtems/regionmp.h b/cpukit/rtems/include/rtems/rtems/regionmp.h
index 4ec1eb1..972f1ba 100644
--- a/cpukit/rtems/include/rtems/rtems/regionmp.h
+++ b/cpukit/rtems/include/rtems/rtems/regionmp.h
@@ -21,16 +21,17 @@
#ifndef _RTEMS_RTEMS_REGIONMP_H
#define _RTEMS_RTEMS_REGIONMP_H
-#ifdef __cplusplus
-extern "C" {
+#ifndef _RTEMS_RTEMS_REGIONIMPL_H
+# error "Never use <rtems/rtems/regionmp.h> directly; include <rtems/rtems/regionimpl.h> instead."
#endif
#include <rtems/score/mppkt.h>
#include <rtems/score/object.h>
#include <rtems/score/thread.h>
-#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
/**
* @defgroup ClassicRegionMP Region MP Support
diff --git a/cpukit/rtems/inline/rtems/rtems/region.inl b/cpukit/rtems/inline/rtems/rtems/region.inl
deleted file mode 100644
index 30e482c..0000000
--- a/cpukit/rtems/inline/rtems/rtems/region.inl
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file rtems/rtems/region.inl
- *
- * @addtogroup ClassicRegion
- *
- * @ingroup ClassicRTEMS
- * @brief Macro Implementation from Region Manager
- *
- * This file contains the macro implementation of the inlined
- * routines from the Region Manager.
- */
-
-/* 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.com/license/LICENSE.
- */
-
-#ifndef _RTEMS_RTEMS_REGION_H
-# error "Never use <rtems/rtems/region.inl> directly; include <rtems/rtems/region.h> instead."
-#endif
-
-#ifndef _RTEMS_RTEMS_REGION_INL
-#define _RTEMS_RTEMS_REGION_INL
-
-/**
- * @addtogroup ClassicRegion
- * @{
- */
-
-/**
- * @brief Region_Allocate
- *
- * This function allocates a region control block from
- * the inactive chain of free region control blocks.
- */
-RTEMS_INLINE_ROUTINE Region_Control *_Region_Allocate( void )
-{
- return (Region_Control *) _Objects_Allocate( &_Region_Information );
-}
-
-/**
- * @brief Region_Free
- *
- * This routine frees a region control block to the
- * inactive chain of free region control blocks.
- */
-RTEMS_INLINE_ROUTINE void _Region_Free (
- Region_Control *the_region
-)
-{
- _Objects_Free( &_Region_Information, &the_region->Object );
-}
-
-/**
- * @brief Region_Get
- *
- * This function maps region IDs to region control blocks.
- * If ID corresponds to a local region, then it returns
- * the_region control pointer which maps to ID and location
- * is set to OBJECTS_LOCAL. Otherwise, location is set
- * to OBJECTS_ERROR and the_region is undefined.
- */
-RTEMS_INLINE_ROUTINE Region_Control *_Region_Get (
- Objects_Id id,
- Objects_Locations *location
-)
-{
- return (Region_Control *)
- _Objects_Get_no_protection( &_Region_Information, id, location );
-}
-
-/**
- * @brief Region_Allocate_segment
- *
- * This function attempts to allocate a segment from the_region.
- * If successful, it returns the address of the allocated segment.
- * Otherwise, it returns NULL.
- */
-RTEMS_INLINE_ROUTINE void *_Region_Allocate_segment (
- Region_Control *the_region,
- uintptr_t size
-)
-{
- return _Heap_Allocate( &the_region->Memory, size );
-}
-
-/**
- * @brief Region_Free_segment
- *
- * This function frees the_segment to the_region.
- */
-RTEMS_INLINE_ROUTINE bool _Region_Free_segment (
- Region_Control *the_region,
- void *the_segment
-)
-{
- return _Heap_Free( &the_region->Memory, the_segment );
-}
-
-/**
- * @brief Region_Is_null
- *
- * This function returns TRUE if the_region is NULL and FALSE otherwise.
- */
-RTEMS_INLINE_ROUTINE bool _Region_Is_null (
- Region_Control *the_region
-)
-{
- return ( the_region == NULL );
-}
-
-/**@}*/
-
-#endif
-/* end of include file */
diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am
index f98fd14..6ba32af 100644
--- a/cpukit/rtems/preinstall.am
+++ b/cpukit/rtems/preinstall.am
@@ -131,6 +131,10 @@ $(PROJECT_INCLUDE)/rtems/rtems/region.h: include/rtems/rtems/region.h $(PROJECT_
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/region.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/region.h
+$(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h: include/rtems/rtems/regionimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h
+
$(PROJECT_INCLUDE)/rtems/rtems/rtemsapi.h: include/rtems/rtems/rtemsapi.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/rtemsapi.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/rtemsapi.h
@@ -221,10 +225,6 @@ $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h: include/rtems/rtems/taskmp.h $(PROJECT_
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
endif
-$(PROJECT_INCLUDE)/rtems/rtems/region.inl: inline/rtems/rtems/region.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/region.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/region.inl
-
$(PROJECT_INCLUDE)/rtems/rtems/tasks.inl: inline/rtems/rtems/tasks.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl
diff --git a/cpukit/rtems/src/region.c b/cpukit/rtems/src/region.c
index 309b3c6..66cb3c4 100644
--- a/cpukit/rtems/src/region.c
+++ b/cpukit/rtems/src/region.c
@@ -24,7 +24,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regioncreate.c b/cpukit/rtems/src/regioncreate.c
index cd17393..163ba99 100644
--- a/cpukit/rtems/src/regioncreate.c
+++ b/cpukit/rtems/src/regioncreate.c
@@ -24,7 +24,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regiondata.c b/cpukit/rtems/src/regiondata.c
index 97fdc11..da075fb 100644
--- a/cpukit/rtems/src/regiondata.c
+++ b/cpukit/rtems/src/regiondata.c
@@ -21,5 +21,4 @@
/* instantiate RTEMS Region data */
#define RTEMS_REGION_EXTERN
-#include <rtems/system.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
diff --git a/cpukit/rtems/src/regiondelete.c b/cpukit/rtems/src/regiondelete.c
index 8ad5085..c057545 100644
--- a/cpukit/rtems/src/regiondelete.c
+++ b/cpukit/rtems/src/regiondelete.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regionextend.c b/cpukit/rtems/src/regionextend.c
index d5e3cd6..1c31ea2 100644
--- a/cpukit/rtems/src/regionextend.c
+++ b/cpukit/rtems/src/regionextend.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regiongetfreeinfo.c b/cpukit/rtems/src/regiongetfreeinfo.c
index bd16b0e..830a888 100644
--- a/cpukit/rtems/src/regiongetfreeinfo.c
+++ b/cpukit/rtems/src/regiongetfreeinfo.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/apimutex.h>
#include <rtems/score/thread.h>
diff --git a/cpukit/rtems/src/regiongetinfo.c b/cpukit/rtems/src/regiongetinfo.c
index fef9f50..0b60f9d 100644
--- a/cpukit/rtems/src/regiongetinfo.c
+++ b/cpukit/rtems/src/regiongetinfo.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/apimutex.h>
#include <rtems/score/thread.h>
diff --git a/cpukit/rtems/src/regiongetsegment.c b/cpukit/rtems/src/regiongetsegment.c
index 645618a..aac68bd 100644
--- a/cpukit/rtems/src/regiongetsegment.c
+++ b/cpukit/rtems/src/regiongetsegment.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/optionsimpl.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regiongetsegmentsize.c b/cpukit/rtems/src/regiongetsegmentsize.c
index 94a6686..9dd793f 100644
--- a/cpukit/rtems/src/regiongetsegmentsize.c
+++ b/cpukit/rtems/src/regiongetsegmentsize.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regionident.c b/cpukit/rtems/src/regionident.c
index 8d6e088..6ab8719 100644
--- a/cpukit/rtems/src/regionident.c
+++ b/cpukit/rtems/src/regionident.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regionmp.c b/cpukit/rtems/src/regionmp.c
index e77e0d4..6828fbb 100644
--- a/cpukit/rtems/src/regionmp.c
+++ b/cpukit/rtems/src/regionmp.c
@@ -24,7 +24,7 @@
#include <rtems/score/mppkt.h>
#include <rtems/score/object.h>
#include <rtems/rtems/optionsimpl.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/thread.h>
#include <rtems/rtems/support.h>
diff --git a/cpukit/rtems/src/regionprocessqueue.c b/cpukit/rtems/src/regionprocessqueue.c
index d7fc555..bd6b2f0 100644
--- a/cpukit/rtems/src/regionprocessqueue.c
+++ b/cpukit/rtems/src/regionprocessqueue.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c
index 3d8aeb6..20fea98 100644
--- a/cpukit/rtems/src/regionresizesegment.c
+++ b/cpukit/rtems/src/regionresizesegment.c
@@ -23,7 +23,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/rtems/src/regionreturnsegment.c b/cpukit/rtems/src/regionreturnsegment.c
index 56783a7..46fda06 100644
--- a/cpukit/rtems/src/regionreturnsegment.c
+++ b/cpukit/rtems/src/regionreturnsegment.c
@@ -31,7 +31,7 @@
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>
#include <rtems/score/apimutex.h>
diff --git a/cpukit/sapi/src/rtemsapi.c b/cpukit/sapi/src/rtemsapi.c
index 8814e87..1153012 100644
--- a/cpukit/sapi/src/rtemsapi.c
+++ b/cpukit/sapi/src/rtemsapi.c
@@ -37,7 +37,7 @@
#endif
#include <rtems/rtems/partimpl.h>
#include <rtems/rtems/ratemonimpl.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/rtems/semimpl.h>
#include <rtems/rtems/signal.h>
#include <rtems/rtems/timerimpl.h>
diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c
index 25df94f..74818bd 100644
--- a/testsuites/sptests/spsize/size.c
+++ b/testsuites/sptests/spsize/size.c
@@ -36,7 +36,7 @@
#include <rtems/rtems/partimpl.h>
#include <rtems/score/priority.h>
#include <rtems/rtems/ratemonimpl.h>
-#include <rtems/rtems/region.h>
+#include <rtems/rtems/regionimpl.h>
#include <rtems/rtems/semimpl.h>
#include <rtems/rtems/signal.h>
#include <rtems/score/scheduler.h>
@@ -344,7 +344,7 @@ uninitialized =
/*ratemonimpl.h*/ (sizeof _Rate_monotonic_Information) +
-/*region.h*/ (sizeof _Region_Information) +
+/*regionimpl.h*/ (sizeof _Region_Information) +
#if defined(RTEMS_MULTIPROCESSING)
/*regionmp.h*/ 0 +
More information about the vc
mailing list