summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-12-01 17:31:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-12-01 17:31:11 +0000
commite65f596dfd5aaf4deea2d1692417bb389b9a6d61 (patch)
treee366fdc3bff46599db3307a5c57e62335f06c3d3 /cpukit
parent2008-12-01 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-e65f596dfd5aaf4deea2d1692417bb389b9a6d61.tar.bz2
2008-12-01 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems/include/rtems/rtems/region.h, rtems/include/rtems/rtems/support.h, rtems/src/regiongetsegmentsize.c, rtems/src/regionresizesegment.c, rtems/src/workspace.c: Revert ssize_t patch.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog7
-rw-r--r--cpukit/rtems/include/rtems/rtems/region.h57
-rw-r--r--cpukit/rtems/include/rtems/rtems/support.h4
-rw-r--r--cpukit/rtems/src/regiongetsegmentsize.c2
-rw-r--r--cpukit/rtems/src/regionresizesegment.c4
-rw-r--r--cpukit/rtems/src/workspace.c4
6 files changed, 23 insertions, 55 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 6ec1e1f3f7..2a9c580477 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-01 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * rtems/include/rtems/rtems/region.h,
+ rtems/include/rtems/rtems/support.h,
+ rtems/src/regiongetsegmentsize.c, rtems/src/regionresizesegment.c,
+ rtems/src/workspace.c: Revert ssize_t patch.
+
2008-11-26 Joel Sherrill <joel.sherrill@oarcorp.com>
* score/Makefile.am, score/include/rtems/score/watchdog.h: Add
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h
index 20da771121..74d66ea334 100644
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ b/cpukit/rtems/include/rtems/rtems/region.h
@@ -66,53 +66,14 @@ extern "C" {
*/
typedef struct {
- /**
- * This field is the object management portion of a Region instance.
- */
Objects_Control Object;
-
- /**
- * This is the set of threads blocked waiting on memory.
- */
- Thread_queue_Control Wait_queue;
-
- /**
- * This is the physical starting address of the Region area.
- */
- void *starting_address;
-
- /**
- * This is the physical length (in bytes) of the Region memory.
- */
- uint32_t length;
-
- /**
- * This is the physical page size (in bytes) of each allocated segment.
- */
- uint32_t page_size;
-
- /**
- * This is the maximum segment size (in bytes) that can ever be allocated
- * from this Region. It is calculated at creation time.
- */
- uint32_t maximum_segment_size;
-
- /**
- * This is the Classic API attribute provided to the create directive.
- * It is translated into behavioral attributes on the SuperCore Heap
- * instance.
- */
+ Thread_queue_Control Wait_queue; /* waiting threads */
+ void *starting_address; /* physical start addr */
+ uint32_t length; /* physical length(bytes) */
+ uint32_t page_size; /* in bytes */
+ uint32_t maximum_segment_size; /* in bytes */
rtems_attribute attribute_set;
-
- /**
- * This is the number of blocks currently allocated from this Region.
- */
- uint32_t number_of_used_blocks;
-
- /**
- * This is the Heap instance which implements the core functionality
- * of a Region instance.
- */
+ uint32_t number_of_used_blocks; /* blocks allocated */
Heap_Control Memory;
} Region_Control;
@@ -240,7 +201,7 @@ rtems_status_code rtems_region_get_segment(
rtems_status_code rtems_region_get_segment_size(
Objects_Id id,
void *segment,
- ssize_t *size
+ size_t *size
);
/**
@@ -282,8 +243,8 @@ rtems_status_code rtems_region_return_segment(
rtems_status_code rtems_region_resize_segment(
Objects_Id id,
void *segment,
- ssize_t size,
- ssize_t *old_size
+ size_t size,
+ size_t *old_size
);
#ifndef __RTEMS_APPLICATION__
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/rtems/include/rtems/rtems/support.h
index 8364bdca91..25f6ebf08d 100644
--- a/cpukit/rtems/include/rtems/rtems/support.h
+++ b/cpukit/rtems/include/rtems/rtems/support.h
@@ -79,8 +79,8 @@ bool rtems_workspace_get_information(
* @return TRUE if successful
*/
bool rtems_workspace_allocate(
- ssize_t bytes,
- void **pointer
+ size_t bytes,
+ void **pointer
);
/**
diff --git a/cpukit/rtems/src/regiongetsegmentsize.c b/cpukit/rtems/src/regiongetsegmentsize.c
index 53c91808aa..7d70b6188b 100644
--- a/cpukit/rtems/src/regiongetsegmentsize.c
+++ b/cpukit/rtems/src/regiongetsegmentsize.c
@@ -45,7 +45,7 @@
rtems_status_code rtems_region_get_segment_size(
Objects_Id id,
void *segment,
- ssize_t *size
+ size_t *size
)
{
Objects_Locations location;
diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c
index 0f031a737a..43cb302afd 100644
--- a/cpukit/rtems/src/regionresizesegment.c
+++ b/cpukit/rtems/src/regionresizesegment.c
@@ -46,8 +46,8 @@
rtems_status_code rtems_region_resize_segment(
Objects_Id id,
void *segment,
- ssize_t size,
- ssize_t *old_size
+ size_t size,
+ size_t *old_size
)
{
uint32_t avail_size;
diff --git a/cpukit/rtems/src/workspace.c b/cpukit/rtems/src/workspace.c
index c7405bcf32..f573440475 100644
--- a/cpukit/rtems/src/workspace.c
+++ b/cpukit/rtems/src/workspace.c
@@ -39,8 +39,8 @@ bool rtems_workspace_get_information(
* _Workspace_Allocate
*/
bool rtems_workspace_allocate(
- ssize_t bytes,
- void **pointer
+ size_t bytes,
+ void **pointer
)
{
*pointer = _Heap_Allocate( &_Workspace_Area, bytes );