diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-07 16:48:30 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-12 07:36:18 +0200 |
commit | 572cb6242969f96a5bf74dc107e3f845894b6b2b (patch) | |
tree | be87de631165d9314f36ad6d48e15b8ca8fb9d7b /cpukit/rtems/src/regiongetsegmentsize.c | |
parent | rtems: Ensure lock ownership for _Region_Get() (diff) | |
download | rtems-572cb6242969f96a5bf74dc107e3f845894b6b2b.tar.bz2 |
score: Simplify _Objects_Get_no_protection()
This functions supports only local objects. Thus, drop the location
parameter which was unused by all callers.
Remove superfluous includes from Classic Region implementation.
Diffstat (limited to '')
-rw-r--r-- | cpukit/rtems/src/regiongetsegmentsize.c | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/cpukit/rtems/src/regiongetsegmentsize.c b/cpukit/rtems/src/regiongetsegmentsize.c index ab07a56e9c..21a2bb4bde 100644 --- a/cpukit/rtems/src/regiongetsegmentsize.c +++ b/cpukit/rtems/src/regiongetsegmentsize.c @@ -18,12 +18,7 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/rtems/status.h> -#include <rtems/rtems/support.h> -#include <rtems/rtems/options.h> #include <rtems/rtems/regionimpl.h> -#include <rtems/score/apimutex.h> rtems_status_code rtems_region_get_segment_size( rtems_id id, @@ -31,35 +26,31 @@ rtems_status_code rtems_region_get_segment_size( uintptr_t *size ) { - Objects_Locations location; - rtems_status_code return_status = RTEMS_SUCCESSFUL; - Region_Control *the_region; + rtems_status_code status; + Region_Control *the_region; - if ( !segment ) + if ( segment == NULL ) { return RTEMS_INVALID_ADDRESS; + } - if ( !size ) + if ( size == NULL ) { return RTEMS_INVALID_ADDRESS; + } _RTEMS_Lock_allocator(); - the_region = _Region_Get( id, &location ); - switch ( location ) { + the_region = _Region_Get( id ); - case OBJECTS_LOCAL: - if ( !_Heap_Size_of_alloc_area( &the_region->Memory, segment, size ) ) - return_status = RTEMS_INVALID_ADDRESS; - break; - -#if defined(RTEMS_MULTIPROCESSING) - case OBJECTS_REMOTE: /* this error cannot be returned */ -#endif - - case OBJECTS_ERROR: - return_status = RTEMS_INVALID_ID; - break; + if ( the_region != NULL ) { + if ( _Heap_Size_of_alloc_area( &the_region->Memory, segment, size ) ) { + status = RTEMS_SUCCESSFUL; + } else { + status = RTEMS_INVALID_ADDRESS; } + } else { + status = RTEMS_INVALID_ID; + } _RTEMS_Unlock_allocator(); - return return_status; + return status; } |