score: Create heap implementation header

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

13 files changed, 18 insertions, 19 deletions

diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
index 89dcd34fa6..6773f2ac52 100644
--- a/cpukit/score/src/heap.c
+++ b/cpukit/score/src/heap.c
@@ -18,15 +18,14 @@
  */
 
 #if HAVE_CONFIG_H
-#include "config.h"
+  #include "config.h"
 #endif
 
-#include <string.h>
-
-#include <rtems/system.h>
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 #include <rtems/score/interr.h>
 
+#include <string.h>
+
 #if CPU_ALIGNMENT == 0 || CPU_ALIGNMENT % 2 != 0
   #error "invalid CPU_ALIGNMENT value"
 #endif
diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c
index a912644d80..6367fac426 100644
--- a/cpukit/score/src/heapallocate.c
+++ b/cpukit/score/src/heapallocate.c
@@ -23,7 +23,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/sysstate.h>
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 #ifndef HEAP_PROTECTION
   #define _Heap_Protection_free_delayed_blocks( heap, alloc_begin ) false
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index aaaabf4236..571bba8428 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -23,7 +23,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/sysstate.h>
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 static void _Heap_Free_block( Heap_Control *heap, Heap_Block *block )
 {
diff --git a/cpukit/score/src/heapfree.c b/cpukit/score/src/heapfree.c
index bd85cad9fc..d15094ce77 100644
--- a/cpukit/score/src/heapfree.c
+++ b/cpukit/score/src/heapfree.c
@@ -20,7 +20,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 #ifndef HEAP_PROTECTION
   #define _Heap_Protection_determine_block_free( heap, block ) true
diff --git a/cpukit/score/src/heapgetfreeinfo.c b/cpukit/score/src/heapgetfreeinfo.c
index be0bfd883a..de6e3dc555 100644
--- a/cpukit/score/src/heapgetfreeinfo.c
+++ b/cpukit/score/src/heapgetfreeinfo.c
@@ -21,7 +21,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/sysstate.h>
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 void _Heap_Get_free_information(
   Heap_Control        *the_heap,
diff --git a/cpukit/score/src/heapgetinfo.c b/cpukit/score/src/heapgetinfo.c
index d796ba44e4..ded488b560 100644
--- a/cpukit/score/src/heapgetinfo.c
+++ b/cpukit/score/src/heapgetinfo.c
@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 static bool _Heap_Get_information_visitor(
   const Heap_Block *block __attribute__((unused)),
diff --git a/cpukit/score/src/heapgreedy.c b/cpukit/score/src/heapgreedy.c
index b5c61a4e64..833a80ea34 100644
--- a/cpukit/score/src/heapgreedy.c
+++ b/cpukit/score/src/heapgreedy.c
@@ -24,7 +24,7 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 Heap_Block *_Heap_Greedy_allocate(
   Heap_Control *heap,
diff --git a/cpukit/score/src/heapiterate.c b/cpukit/score/src/heapiterate.c
index b5c900a81f..893bcc1f80 100644
--- a/cpukit/score/src/heapiterate.c
+++ b/cpukit/score/src/heapiterate.c
@@ -24,7 +24,7 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 void _Heap_Iterate(
   Heap_Control *heap,
diff --git a/cpukit/score/src/heapnoextend.c b/cpukit/score/src/heapnoextend.c
index 1652f59e17..ef7a2a7243 100644
--- a/cpukit/score/src/heapnoextend.c
+++ b/cpukit/score/src/heapnoextend.c
@@ -24,7 +24,7 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 uintptr_t _Heap_No_extend(
   Heap_Control *unused_0 __attribute__((unused)),
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c
index 742e03fa8f..f791efee44 100644
--- a/cpukit/score/src/heapresizeblock.c
+++ b/cpukit/score/src/heapresizeblock.c
@@ -23,7 +23,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/sysstate.h>
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 static Heap_Resize_status _Heap_Resize_block_checked(
   Heap_Control *heap,
diff --git a/cpukit/score/src/heapsizeofuserarea.c b/cpukit/score/src/heapsizeofuserarea.c
index 5c1ce69acd..7c4d9f3e2e 100644
--- a/cpukit/score/src/heapsizeofuserarea.c
+++ b/cpukit/score/src/heapsizeofuserarea.c
@@ -21,7 +21,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/sysstate.h>
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 
 bool _Heap_Size_of_alloc_area(
   Heap_Control *heap,
diff --git a/cpukit/score/src/heapwalk.c b/cpukit/score/src/heapwalk.c
index c84f1282de..9e8557ae97 100644
--- a/cpukit/score/src/heapwalk.c
+++ b/cpukit/score/src/heapwalk.c
@@ -22,7 +22,7 @@
 #include <rtems/system.h>
 #include <rtems/score/address.h>
 #include <rtems/score/sysstate.h>
-#include <rtems/score/heap.h>
+#include <rtems/score/heapimpl.h>
 #include <rtems/score/interr.h>
 #include <rtems/bspIo.h>
 
diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c
index 72712456fa..b9482960ac 100644
--- a/cpukit/score/src/wkspace.c
+++ b/cpukit/score/src/wkspace.c
@@ -15,13 +15,13 @@
  */
 
 #if HAVE_CONFIG_H
-#include "config.h"
+  #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/config.h>
 #include <rtems/score/wkspace.h>
+#include <rtems/score/heapimpl.h>
 #include <rtems/score/interr.h>
+#include <rtems/config.h>
 
 #include <string.h>  /* for memset */