From c31c15c16c47df7361ef0afc992f560a947a552b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 7 Nov 2001 22:42:04 +0000 Subject: 2001-11-07 Joel Sherrill Reported by Todor.Todorov@barco.com and tracked as PR36. * include/rtems/score/object.h: Added prototype for _Objects_Get_by_index(). * src/objectget.c, src/objectgetisr.c: Corrected procedure for getting index from Id so it is correct and optimal for both single and multiprocessor configurations. --- cpukit/score/ChangeLog | 8 ++++++++ cpukit/score/include/rtems/score/object.h | 5 +++++ cpukit/score/src/objectget.c | 6 +++++- cpukit/score/src/objectgetisr.c | 4 ++++ 4 files changed, 22 insertions(+), 1 deletion(-) (limited to 'cpukit/score') diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog index 77b14250c3..d6aab6880d 100644 --- a/cpukit/score/ChangeLog +++ b/cpukit/score/ChangeLog @@ -1,3 +1,11 @@ +2001-11-07 Joel Sherrill + + Reported by Todor.Todorov@barco.com and tracked as PR36. + * include/rtems/score/object.h: Added prototype for + _Objects_Get_by_index(). + * src/objectget.c, src/objectgetisr.c: Corrected procedure for + getting index from Id so it is correct and optimal for both single + and multiprocessor configurations. 2001-10-22 Joel Sherrill diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h index 26d0eb33de..ced94e685b 100644 --- a/cpukit/score/include/rtems/score/object.h +++ b/cpukit/score/include/rtems/score/object.h @@ -454,6 +454,11 @@ Objects_Control *_Objects_Get_isr_disable( ISR_Level *level ); +Objects_Control *_Objects_Get_by_index ( + Objects_Information *information, + Objects_Id id, + Objects_Locations *location +); /* * _Objects_Get_next * diff --git a/cpukit/score/src/objectget.c b/cpukit/score/src/objectget.c index 4c30d2a008..8a551c6741 100644 --- a/cpukit/score/src/objectget.c +++ b/cpukit/score/src/objectget.c @@ -53,12 +53,16 @@ Objects_Control *_Objects_Get( Objects_Control *the_object; unsigned32 index; +#if defined(RTEMS_MULTIPROCESSING) + index = id - information->minimum_id + 1; +#else /* index = _Objects_Get_index( id ); */ index = id & 0x0000ffff; /* This should work but doesn't always :( */ /* index = (unsigned16) id; */ +#endif - if ( information->maximum >= index ) { + if ( information->maximum >= index ) { _Thread_Disable_dispatch(); if ( (the_object = information->local_table[ index ]) != NULL ) { *location = OBJECTS_LOCAL; diff --git a/cpukit/score/src/objectgetisr.c b/cpukit/score/src/objectgetisr.c index 9d0951d9fd..18ca18cd5c 100644 --- a/cpukit/score/src/objectgetisr.c +++ b/cpukit/score/src/objectgetisr.c @@ -57,10 +57,14 @@ Objects_Control *_Objects_Get_isr_disable( unsigned32 index; ISR_Level level; +#if defined(RTEMS_MULTIPROCESSING) + index = id - information->minimum_id + 1; +#else /* index = _Objects_Get_index( id ); */ index = id & 0x0000ffff; /* This should work but doesn't always :( */ /* index = (unsigned16) id; */ +#endif _ISR_Disable( level ); if ( information->maximum >= index ) { -- cgit v1.2.3