summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-12-11 23:43:26 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-12-11 23:43:26 +0000
commitb21d4f78ede0665ed4f51c14fd957e29627781a1 (patch)
tree7a7e685964ddc78769fabd95535cd6b12e522283
parent2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-b21d4f78ede0665ed4f51c14fd957e29627781a1.tar.bz2
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/src/pheapallocatealigned.c, score/src/pheapgetblocksize.c: Reverse file contents.
-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 3205f0dc63..4be440234e 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * score/src/pheapallocatealigned.c, score/src/pheapgetblocksize.c:
+ Reverse file contents.
+
+2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* sapi/include/rtems/config.h: Correct idle task prototype.
2007-12-11 Joel Sherrill <joel.sherrill@oarcorp.com>
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;
}
-