diff options
-rw-r--r-- | cpukit/ChangeLog | 7 | ||||
-rw-r--r-- | cpukit/rtems/src/rtemsobjectapimaximumclass.c | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/object.h | 4 | ||||
-rw-r--r-- | cpukit/score/src/objectapimaximumclass.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/objectgetinfo.c | 2 |
5 files changed, 13 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 831ba5ece6..f86c69d4a1 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2009-07-07 Joel Sherrill <joel.sherrill@oarcorp.com> + + * rtems/src/rtemsobjectapimaximumclass.c, + score/include/rtems/score/object.h, + score/src/objectapimaximumclass.c, score/src/objectgetinfo.c: Change + return type of API maximum class methods to unsigned. + 2009-07-07 Chris Johns <chrisj@rtems.org> * score/src/objectshrinkinformation.c: Rework loop to simplify and diff --git a/cpukit/rtems/src/rtemsobjectapimaximumclass.c b/cpukit/rtems/src/rtemsobjectapimaximumclass.c index 1eb1a3bad6..c679deebc4 100644 --- a/cpukit/rtems/src/rtemsobjectapimaximumclass.c +++ b/cpukit/rtems/src/rtemsobjectapimaximumclass.c @@ -19,7 +19,7 @@ #include <rtems/score/object.h> #include <rtems/rtems/types.h> -int rtems_object_api_maximum_class( +unsigned int rtems_object_api_maximum_class( uint32_t api ) { diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h index 54f4dc5875..8f524e5701 100644 --- a/cpukit/score/include/rtems/score/object.h +++ b/cpukit/score/include/rtems/score/object.h @@ -492,9 +492,9 @@ void _Objects_Initialize_information ( * * @param[in] api is the API of interest * - * @return A positive integer on success and -1 otherwise. + * @return A positive integer on success and 0 otherwise. */ -int _Objects_API_maximum_class( +unsigned int _Objects_API_maximum_class( uint32_t api ); diff --git a/cpukit/score/src/objectapimaximumclass.c b/cpukit/score/src/objectapimaximumclass.c index f156f8c7dd..51205c44da 100644 --- a/cpukit/score/src/objectapimaximumclass.c +++ b/cpukit/score/src/objectapimaximumclass.c @@ -16,7 +16,7 @@ #include <rtems/system.h> #include <rtems/score/object.h> -int _Objects_API_maximum_class( +unsigned int _Objects_API_maximum_class( uint32_t api ) { @@ -33,6 +33,6 @@ int _Objects_API_maximum_class( default: break; } - return -1; + return 0; } diff --git a/cpukit/score/src/objectgetinfo.c b/cpukit/score/src/objectgetinfo.c index de13fa1998..dd8e84a7da 100644 --- a/cpukit/score/src/objectgetinfo.c +++ b/cpukit/score/src/objectgetinfo.c @@ -33,7 +33,7 @@ Objects_Information *_Objects_Get_information( return NULL; the_class_api_maximum = _Objects_API_maximum_class( the_api ); - if ( the_class_api_maximum < 0 || + if ( the_class_api_maximum == 0 || the_class > (uint32_t) the_class_api_maximum ) return NULL; |