2009-11-23 Joel Sherrill <joel.sherrill@oarcorp.com>

	PR 1460/cpukit
	* rtems/include/rtems/rtems/object.h,
	rtems/src/rtemsobjectapimaximumclass.c,
	rtems/src/rtemsobjectgetapiclassname.c,
	rtems/src/rtemsobjectgetapiname.c,
	rtems/src/rtemsobjectgetclassinfo.c,
	rtems/src/rtemsobjectidapimaximum.c,
	rtems/src/rtemsobjectidapiminimum.c, rtems/src/rtemsobjectidgetapi.c,
	rtems/src/rtemsobjectidgetclass.c, rtems/src/rtemsobjectidgetindex.c,
	rtems/src/rtemsobjectidgetnode.c: Change return type on methods
	accessing portions of RTEMS Ids to int. This allows -1 to be return
	on error.

11 files changed, 41 insertions, 24 deletions

diff --git a/cpukit/rtems/include/rtems/rtems/object.h b/cpukit/rtems/include/rtems/rtems/object.h
index d419a3b095..5a6e97189a 100644
--- a/cpukit/rtems/include/rtems/rtems/object.h
+++ b/cpukit/rtems/include/rtems/rtems/object.h
@@ -249,15 +249,32 @@ rtems_status_code rtems_object_set_name(
  *  specified @a api.  Each API supports a different number
  *  of object classes.
  *
- *  @param[in] api is the API to obtain the maximum class of
+ *  @param[in] api is the API to obtain the minimum class of
  *
  *  @return This method returns the least valid value for
  *          class number for the specified @a api.
  */
-uint32_t rtems_object_id_api_minimum_class(
-  uint32_t api
+int rtems_object_api_minimum_class(
+  int api
+);
+
+/**
+ *  @brief Get Highest Valid Class Value
+ *
+ *  This method returns the highest valid value Class for the 
+ *  specified @a api.  Each API supports a different number
+ *  of object classes.
+ *
+ *  @param[in] api is the API to obtain the maximum class of
+ *
+ *  @return This method returns the greatet valid value for
+ *          class number for the specified @a api.
+ */
+int rtems_object_api_maximum_class(
+  int api
 );
 
+
 /**
  *  @brief Get Highest Valid Class Value
  *
@@ -271,7 +288,7 @@ uint32_t rtems_object_id_api_minimum_class(
  *          class number for the specified @a api.
  */
 int rtems_object_id_api_maximum_class(
-  uint32_t api
+  int api
 );
 
 /**
@@ -287,7 +304,7 @@ int rtems_object_id_api_maximum_class(
  *          the string "BAD API"
  */
 const char *rtems_object_get_api_name(
-  uint32_t api
+  int api
 );
 
 /**
@@ -304,8 +321,8 @@ const char *rtems_object_get_api_name(
  *          the string "BAD CLASS"
  */
 const char *rtems_object_get_api_class_name(
-  uint32_t the_api, 
-  uint32_t the_class
+  int the_api, 
+  int the_class
 );
 
 /**
@@ -324,8 +341,8 @@ const char *rtems_object_get_api_class_name(
  *
  */
 rtems_status_code rtems_object_get_class_information(
-  uint32_t                            the_api,
-  uint32_t                            the_class,
+  int                                 the_api,
+  int                                 the_class,
   rtems_object_api_class_information *info
 );
 
diff --git a/cpukit/rtems/src/rtemsobjectapimaximumclass.c b/cpukit/rtems/src/rtemsobjectapimaximumclass.c
index c679deebc4..16133084d2 100644
--- a/cpukit/rtems/src/rtemsobjectapimaximumclass.c
+++ b/cpukit/rtems/src/rtemsobjectapimaximumclass.c
@@ -19,8 +19,8 @@
 #include <rtems/score/object.h>
 #include <rtems/rtems/types.h>
 
-unsigned int rtems_object_api_maximum_class(
-  uint32_t api
+int rtems_object_api_maximum_class(
+  int api
 )
 {
   return _Objects_API_maximum_class(api);
diff --git a/cpukit/rtems/src/rtemsobjectgetapiclassname.c b/cpukit/rtems/src/rtemsobjectgetapiclassname.c
index 828feb46d2..56cf8a3197 100644
--- a/cpukit/rtems/src/rtemsobjectgetapiclassname.c
+++ b/cpukit/rtems/src/rtemsobjectgetapiclassname.c
@@ -70,8 +70,8 @@ rtems_assoc_t rtems_object_api_itron_assoc[] = {
 #endif
 
 const char *rtems_object_get_api_class_name(
-  uint32_t the_api, 
-  uint32_t the_class
+  int the_api, 
+  int the_class
 )
 {
   const rtems_assoc_t *api_assoc;
diff --git a/cpukit/rtems/src/rtemsobjectgetapiname.c b/cpukit/rtems/src/rtemsobjectgetapiname.c
index 4356d4cdc4..026bd55a7d 100644
--- a/cpukit/rtems/src/rtemsobjectgetapiname.c
+++ b/cpukit/rtems/src/rtemsobjectgetapiname.c
@@ -30,7 +30,7 @@ rtems_assoc_t rtems_objects_api_assoc[] = {
 };
 
 const char *rtems_object_get_api_name(
-  uint32_t api
+  int api
 )
 {
   const rtems_assoc_t *api_assoc;
diff --git a/cpukit/rtems/src/rtemsobjectgetclassinfo.c b/cpukit/rtems/src/rtemsobjectgetclassinfo.c
index 01ca394216..4f20a6f61f 100644
--- a/cpukit/rtems/src/rtemsobjectgetclassinfo.c
+++ b/cpukit/rtems/src/rtemsobjectgetclassinfo.c
@@ -21,14 +21,14 @@
 #include <rtems/rtems/object.h>
 
 rtems_status_code rtems_object_get_class_information(
-  uint32_t                            the_api,
-  uint32_t                            the_class,
+  int                                 the_api,
+  int                                 the_class,
   rtems_object_api_class_information *info
 )
 {
   Objects_Information *obj_info;
-  uint32_t             unallocated;
-  uint32_t             i;
+  int                  unallocated;
+  int                  i;
 
   /*
    * Validate parameters and look up information structure.
diff --git a/cpukit/rtems/src/rtemsobjectidapimaximum.c b/cpukit/rtems/src/rtemsobjectidapimaximum.c
index 340f631eca..bfc00d4cd5 100644
--- a/cpukit/rtems/src/rtemsobjectidapimaximum.c
+++ b/cpukit/rtems/src/rtemsobjectidapimaximum.c
@@ -20,7 +20,7 @@
 #include <rtems/rtems/types.h>
 
 #undef rtems_object_id_api_maximum
-uint32_t rtems_object_id_api_maximum(void)
+int rtems_object_id_api_maximum(void)
 {
   return OBJECTS_ITRON_API;
 }
diff --git a/cpukit/rtems/src/rtemsobjectidapiminimum.c b/cpukit/rtems/src/rtemsobjectidapiminimum.c
index c35678672a..057fa09d70 100644
--- a/cpukit/rtems/src/rtemsobjectidapiminimum.c
+++ b/cpukit/rtems/src/rtemsobjectidapiminimum.c
@@ -20,7 +20,7 @@
 #include <rtems/rtems/types.h>
 
 #undef rtems_object_id_api_minimum
-uint32_t rtems_object_id_api_minimum(void)
+int rtems_object_id_api_minimum(void)
 {
   return OBJECTS_INTERNAL_API;
 }
diff --git a/cpukit/rtems/src/rtemsobjectidgetapi.c b/cpukit/rtems/src/rtemsobjectidgetapi.c
index 9fd64eb959..999d5702f0 100644
--- a/cpukit/rtems/src/rtemsobjectidgetapi.c
+++ b/cpukit/rtems/src/rtemsobjectidgetapi.c
@@ -20,7 +20,7 @@
 #include <rtems/rtems/types.h>
 
 #undef rtems_object_id_get_api
-uint32_t rtems_object_id_get_api(
+int rtems_object_id_get_api(
   rtems_id id
 )
 {
diff --git a/cpukit/rtems/src/rtemsobjectidgetclass.c b/cpukit/rtems/src/rtemsobjectidgetclass.c
index 88a5a8b3fb..db31e794e8 100644
--- a/cpukit/rtems/src/rtemsobjectidgetclass.c
+++ b/cpukit/rtems/src/rtemsobjectidgetclass.c
@@ -20,7 +20,7 @@
 #include <rtems/rtems/types.h>
 
 #undef rtems_object_id_get_class
-uint32_t rtems_object_id_get_class(
+int rtems_object_id_get_class(
   rtems_id id
 )
 {
diff --git a/cpukit/rtems/src/rtemsobjectidgetindex.c b/cpukit/rtems/src/rtemsobjectidgetindex.c
index 1ffef83db6..167b238767 100644
--- a/cpukit/rtems/src/rtemsobjectidgetindex.c
+++ b/cpukit/rtems/src/rtemsobjectidgetindex.c
@@ -20,7 +20,7 @@
 #include <rtems/rtems/types.h>
 
 #undef rtems_object_id_get_index
-uint32_t rtems_object_id_get_index(
+int rtems_object_id_get_index(
   rtems_id id
 )
 {
diff --git a/cpukit/rtems/src/rtemsobjectidgetnode.c b/cpukit/rtems/src/rtemsobjectidgetnode.c
index 693a450659..b6278050f9 100644
--- a/cpukit/rtems/src/rtemsobjectidgetnode.c
+++ b/cpukit/rtems/src/rtemsobjectidgetnode.c
@@ -20,7 +20,7 @@
 #include <rtems/rtems/types.h>
 
 #undef rtems_object_id_get_node
-uint32_t rtems_object_id_get_node(
+int rtems_object_id_get_node(
   rtems_id id
 )
 {