summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-12-11 23:44:29 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-12-11 23:44:29 +0000
commit49bf16a3222769b4664dd9fb61e913eac2406ccf (patch)
tree6b95b87ba0c0bf72aa1ccff54cd8c16b959e179d /cpukit
parentRemove from rtems-4-8-branch. (diff)
downloadrtems-49bf16a3222769b4664dd9fb61e913eac2406ccf.tar.bz2
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/src/pheapallocatealigned.c, score/src/pheapgetblocksize.c: Reverse file contents.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/score/src/pheapallocatealigned.c15
-rw-r--r--cpukit/score/src/pheapgetblocksize.c15
3 files changed, 20 insertions, 15 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 79fb9c651c..74c945d1a0 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * score/src/pheapallocatealigned.c, score/src/pheapgetblocksize.c:
+ Reverse file contents.
+
2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* httpd/Makefile.am, httpd/preinstall.am,
diff --git a/cpukit/score/src/pheapallocatealigned.c b/cpukit/score/src/pheapallocatealigned.c
index 897236f370..1e1706063b 100644
--- a/cpukit/score/src/pheapallocatealigned.c
+++ b/cpukit/score/src/pheapallocatealigned.c
@@ -16,16 +16,17 @@
#include <rtems/system.h>
#include <rtems/score/protectedheap.h>
-boolean _Protected_heap_Get_block_size(
- Heap_Control *the_heap,
- void *starting_address,
- size_t *size
+void *_Protected_heap_Allocate_aligned(
+ Heap_Control *the_heap,
+ size_t size,
+ uint32_t alignment
)
{
- boolean status;
+ void *p;
_RTEMS_Lock_allocator();
- status = _Heap_Size_of_user_area( the_heap, starting_address, size );
+ p = _Heap_Allocate_aligned( the_heap, size, alignment );
_RTEMS_Unlock_allocator();
- return status;
+ return p;
}
+
diff --git a/cpukit/score/src/pheapgetblocksize.c b/cpukit/score/src/pheapgetblocksize.c
index 1e1706063b..897236f370 100644
--- a/cpukit/score/src/pheapgetblocksize.c
+++ b/cpukit/score/src/pheapgetblocksize.c
@@ -16,17 +16,16 @@
#include <rtems/system.h>
#include <rtems/score/protectedheap.h>
-void *_Protected_heap_Allocate_aligned(
- Heap_Control *the_heap,
- size_t size,
- uint32_t alignment
+boolean _Protected_heap_Get_block_size(
+ Heap_Control *the_heap,
+ void *starting_address,
+ size_t *size
)
{
- void *p;
+ boolean status;
_RTEMS_Lock_allocator();
- p = _Heap_Allocate_aligned( the_heap, size, alignment );
+ status = _Heap_Size_of_user_area( the_heap, starting_address, size );
_RTEMS_Unlock_allocator();
- return p;
+ return status;
}
-