2004-11-01 Joel Sherrill <joel@OARcorp.com>

	* score/include/rtems/score/object.h, score/src/object.c,
	score/src/objectallocatebyindex.c, score/src/objectcomparenameraw.c,
	score/src/objectcomparenamestring.c, score/src/objectcopynameraw.c,
	score/src/objectinitializeinformation.c: Fix bugs in previous commit.
	Now compiles.

7 files changed, 10 insertions, 10 deletions

diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h
index 8fedfae0e3..88a47682d3 100644
--- a/cpukit/score/include/rtems/score/object.h
+++ b/cpukit/score/include/rtems/score/object.h
@@ -240,8 +240,8 @@ typedef struct {
  */
 
 #if defined(RTEMS_MULTIPROCESSING)
-SCORE_EXTERN uint32_t    _Objects_Local_node;
-SCORE_EXTERN uint32_t    _Objects_Maximum_nodes;
+SCORE_EXTERN uint16_t    _Objects_Local_node;
+SCORE_EXTERN uint16_t    _Objects_Maximum_nodes;
 #else
 #define _Objects_Local_node    1
 #define _Objects_Maximum_nodes 1
diff --git a/cpukit/score/src/object.c b/cpukit/score/src/object.c
index 56b3dad4a2..4a806a7ef2 100644
--- a/cpukit/score/src/object.c
+++ b/cpukit/score/src/object.c
@@ -51,10 +51,10 @@ void _Objects_Handler_initialization(
       INTERNAL_ERROR_INVALID_NODE
     );
 
+#if defined(RTEMS_MULTIPROCESSING)
   _Objects_Local_node    = node;
   _Objects_Maximum_nodes = maximum_nodes;
 
-#if defined(RTEMS_MULTIPROCESSING)
   _Objects_MP_Handler_initialization(
     node,
     maximum_nodes,
diff --git a/cpukit/score/src/objectallocatebyindex.c b/cpukit/score/src/objectallocatebyindex.c
index d3ca6423f1..713e3d3fa9 100644
--- a/cpukit/score/src/objectallocatebyindex.c
+++ b/cpukit/score/src/objectallocatebyindex.c
@@ -37,8 +37,8 @@
 
 Objects_Control *_Objects_Allocate_by_index(
   Objects_Information *information,
-  uint32_t             index,
-  uint32_t             sizeof_control
+  uint16_t             index,
+  uint16_t             sizeof_control
 )
 {
   Objects_Control *the_object;
diff --git a/cpukit/score/src/objectcomparenameraw.c b/cpukit/score/src/objectcomparenameraw.c
index f15db929fe..55696cd138 100644
--- a/cpukit/score/src/objectcomparenameraw.c
+++ b/cpukit/score/src/objectcomparenameraw.c
@@ -34,7 +34,7 @@
 boolean _Objects_Compare_name_raw(
   void       *name_1,
   void       *name_2,
-  uint32_t    length
+  uint16_t    length
 )
 {
 #if 0
diff --git a/cpukit/score/src/objectcomparenamestring.c b/cpukit/score/src/objectcomparenamestring.c
index 53dcd25d7f..9b71cdd059 100644
--- a/cpukit/score/src/objectcomparenamestring.c
+++ b/cpukit/score/src/objectcomparenamestring.c
@@ -44,7 +44,7 @@
 boolean _Objects_Compare_name_string(
   void       *name_1,
   void       *name_2,
-  uint32_t    length
+  uint16_t    length
 )
 {
   if ( !strncmp( name_1, name_2, length ) )
diff --git a/cpukit/score/src/objectcopynameraw.c b/cpukit/score/src/objectcopynameraw.c
index c40328a3e1..d89752b0de 100644
--- a/cpukit/score/src/objectcopynameraw.c
+++ b/cpukit/score/src/objectcopynameraw.c
@@ -34,7 +34,7 @@
 void _Objects_Copy_name_raw(
   void       *source,
   void       *destination,
-  uint32_t    length
+  uint16_t    length
 )
 {
   uint32_t   *source_p = (uint32_t   *) source;
diff --git a/cpukit/score/src/objectinitializeinformation.c b/cpukit/score/src/objectinitializeinformation.c
index 88555a2944..bafc1d935d 100644
--- a/cpukit/score/src/objectinitializeinformation.c
+++ b/cpukit/score/src/objectinitializeinformation.c
@@ -47,8 +47,8 @@ void _Objects_Initialize_information(
   Objects_Information *information,
   Objects_APIs         the_api,
   uint32_t             the_class,
-  uint32_t             maximum,
-  uint32_t             size,
+  Objects_Maximum      maximum,
+  uint16_t             size,
   boolean              is_string,
   uint32_t             maximum_name_length
 #if defined(RTEMS_MULTIPROCESSING)