diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-01-05 20:26:01 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-01-05 20:26:01 +0000 |
commit | 3507c6df7041f19ec33c6056076520849dd59ac3 (patch) | |
tree | 894513e5249272ca6b59e48b0bae503bb410000b /cpukit/posix/src/condget.c | |
parent | 2009-01-05 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-3507c6df7041f19ec33c6056076520849dd59ac3.tar.bz2 |
2009-01-05 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/gxx_wrappers.c, posix/include/mqueue.h,
posix/include/rtems/posix/semaphore.h,
posix/inline/rtems/posix/barrier.inl,
posix/inline/rtems/posix/key.inl,
posix/inline/rtems/posix/mqueue.inl,
posix/inline/rtems/posix/rwlock.inl,
posix/inline/rtems/posix/semaphore.inl,
posix/inline/rtems/posix/spinlock.inl,
posix/inline/rtems/posix/timer.inl, posix/src/condget.c,
posix/src/mqueuenametoid.c, posix/src/mutexget.c,
posix/src/semaphorenametoid.c, posix/src/semopen.c,
sapi/src/itronapi.c, sapi/src/posixapi.c: Make changes necessary for
all tests to run on SPARC with 16-bit Ids. This required ensuring
that all POSIX and compilering binding code makes a distinction
between the public Id type (e.g. pthread_t, etc.) and the RTEMS
Object_Id type. All POSIX Object Get routines should not take the
POSIX Id type as the argument. Sixteen bit RTEMS Ids should be placed
into the 32-bits reserved by the POSIX API type in a uniform manner
now. This removed all assumptions that the external Id types in POSIX
and ITRON are the same as the internal Object Id type.
Diffstat (limited to 'cpukit/posix/src/condget.c')
-rw-r--r-- | cpukit/posix/src/condget.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cpukit/posix/src/condget.c b/cpukit/posix/src/condget.c index 03ffebbd09..7a0a8bed85 100644 --- a/cpukit/posix/src/condget.c +++ b/cpukit/posix/src/condget.c @@ -29,20 +29,19 @@ POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get ( Objects_Locations *location ) { - Objects_Id *id = (Objects_Id *)cond; int status; - if ( !id ) { + if ( !cond ) { *location = OBJECTS_ERROR; return (POSIX_Condition_variables_Control *) 0; } - if ( *id == PTHREAD_COND_INITIALIZER ) { + if ( *cond == PTHREAD_COND_INITIALIZER ) { /* * Do an "auto-create" here. */ - status = pthread_cond_init( (pthread_cond_t *)id, 0 ); + status = pthread_cond_init( cond, 0 ); if ( status ) { *location = OBJECTS_ERROR; return (POSIX_Condition_variables_Control *) 0; @@ -52,8 +51,10 @@ POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get ( /* * Now call Objects_Get() */ - - return (POSIX_Condition_variables_Control *) - _Objects_Get( &_POSIX_Condition_variables_Information, *id, location ); + return (POSIX_Condition_variables_Control *)_Objects_Get( + &_POSIX_Condition_variables_Information, + (Objects_Id) *cond, + location + ); } |