2008-08-04 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* rtems/include/rtems/rtems/sem.h, rtems/src/semobtain.c:
	Changed option set type to rtems_option.

	* score/src/objectgetinfo.c: Check return value of
	_Objects_API_maximum_class().

	* libmisc/monitor/mon-mpci.c, libmisc/monitor/monitor.h,
	rtems/include/rtems/rtems/message.h, rtems/src/msgmp.c,
	rtems/src/msgqallocate.c, rtems/src/msgqbroadcast.c,
	rtems/src/msgqcreate.c, rtems/src/msgqreceive.c, rtems/src/msgqsend.c,
	rtems/src/msgqurgent.c, score/include/rtems/score/coremsg.h,
	score/include/rtems/score/mpci.h, score/include/rtems/score/thread.h,
	score/inline/rtems/score/coremsg.inl, score/src/coremsg.c,
	score/src/coremsgbroadcast.c, score/src/coremsgseize.c,
	score/src/coremsgsubmit.c:
	Removed parameters of _Message_queue_Allocate().  Changed option set
	type to rtems_option.  Changed type of maximum message and packet size
	to size_t.  Changed the input buffer type for message send functions to
	"const void *".  Changed the pointer to the second return argument in
	the thread wait information to a union.  This union can contain a
	pointer to an immutable or a mutable object.  This is somewhat fragile.
	An alternative would be to add a third pointer for immutable objects,
	but this would increase the structure size.

5 files changed, 33 insertions, 28 deletions

diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c
index c7fbac609f..8163df96e5 100644
--- a/cpukit/score/src/coremsg.c
+++ b/cpukit/score/src/coremsg.c
@@ -56,11 +56,11 @@ boolean _CORE_message_queue_Initialize(
   CORE_message_queue_Control    *the_message_queue,
   CORE_message_queue_Attributes *the_message_queue_attributes,
   uint32_t                       maximum_pending_messages,
-  uint32_t                       maximum_message_size
+  size_t                         maximum_message_size
 )
 {
-  uint32_t message_buffering_required;
-  uint32_t allocated_message_size;
+  size_t message_buffering_required;
+  size_t allocated_message_size;
 
   the_message_queue->maximum_pending_messages   = maximum_pending_messages;
   the_message_queue->number_of_pending_messages = 0;
@@ -85,7 +85,7 @@ boolean _CORE_message_queue_Initialize(
    *  Calculate how much total memory is required for message buffering and
    *  check for overflow on the multiplication. 
    */
-  message_buffering_required = maximum_pending_messages *
+  message_buffering_required = (size_t) maximum_pending_messages *
        (allocated_message_size + sizeof(CORE_message_queue_Buffer_control));
  
   if (message_buffering_required < allocated_message_size)
@@ -107,7 +107,7 @@ boolean _CORE_message_queue_Initialize(
   _Chain_Initialize (
     &the_message_queue->Inactive_messages,
     the_message_queue->message_buffers,
-    maximum_pending_messages,
+    (size_t) maximum_pending_messages,
     allocated_message_size + sizeof( CORE_message_queue_Buffer_control )
   );
  
diff --git a/cpukit/score/src/coremsgbroadcast.c b/cpukit/score/src/coremsgbroadcast.c
index 1710e6168e..287a17ab92 100644
--- a/cpukit/score/src/coremsgbroadcast.c
+++ b/cpukit/score/src/coremsgbroadcast.c
@@ -56,7 +56,7 @@
 
 CORE_message_queue_Status _CORE_message_queue_Broadcast(
   CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
+  const void                                *buffer,
   size_t                                     size,
   Objects_Id                                 id,
   CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
@@ -66,7 +66,7 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast(
   Thread_Control          *the_thread;
   uint32_t                 number_broadcasted;
   Thread_Wait_information *waitp;
-  uint32_t                 constrained_size;
+  size_t                   constrained_size;
 
   /*
    *  If there are pending messages, then there can't be threads
@@ -98,11 +98,11 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast(
 
     _CORE_message_queue_Copy_buffer(
       buffer,
-      waitp->return_argument,
+      waitp->return_argument_second.mutable_object,
       constrained_size
     );
 
-    *(uint32_t   *)the_thread->Wait.return_argument_1 = size;
+    *(size_t *) the_thread->Wait.return_argument = size;
 
 #if defined(RTEMS_MULTIPROCESSING)
     if ( !_Objects_Is_local_id( the_thread->Object.id ) )
diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c
index 010f201b78..48c4d7ecb4 100644
--- a/cpukit/score/src/coremsgseize.c
+++ b/cpukit/score/src/coremsgseize.c
@@ -46,7 +46,7 @@
  *    the_message_queue - pointer to message queue
  *    id                - id of object we are waitig on
  *    buffer            - pointer to message buffer to be filled
- *    size              - pointer to the size of buffer to be filled
+ *    size_p            - pointer to the size of buffer to be filled
  *    wait              - TRUE if wait is allowed, FALSE otherwise
  *    timeout           - time to wait for a message
  *
@@ -63,7 +63,7 @@ void _CORE_message_queue_Seize(
   CORE_message_queue_Control      *the_message_queue,
   Objects_Id                       id,
   void                            *buffer,
-  size_t                          *size,
+  size_t                          *size_p,
   boolean                          wait,
   Watchdog_Interval                timeout
 )
@@ -81,9 +81,9 @@ void _CORE_message_queue_Seize(
     the_message_queue->number_of_pending_messages -= 1;
     _ISR_Enable( level );
 
-    *size = the_message->Contents.size;
+    *size_p = the_message->Contents.size;
     _Thread_Executing->Wait.count = the_message->priority;
-    _CORE_message_queue_Copy_buffer(the_message->Contents.buffer,buffer,*size);
+    _CORE_message_queue_Copy_buffer(the_message->Contents.buffer,buffer,*size_p);
 
     /*
      *  There could be a thread waiting to send a message.  If there
@@ -106,9 +106,9 @@ void _CORE_message_queue_Seize(
      */
 
     the_message->priority  = the_thread->Wait.count;
-    the_message->Contents.size = (uint32_t)the_thread->Wait.option;
+    the_message->Contents.size = (size_t) the_thread->Wait.option;
     _CORE_message_queue_Copy_buffer(
-      the_thread->Wait.return_argument,
+      the_thread->Wait.return_argument_second.immutable_object,
       the_message->Contents.buffer,
       the_message->Contents.size
     );
@@ -128,10 +128,10 @@ void _CORE_message_queue_Seize(
   }
 
   _Thread_queue_Enter_critical_section( &the_message_queue->Wait_queue );
-  executing->Wait.queue              = &the_message_queue->Wait_queue;
-  executing->Wait.id                 = id;
-  executing->Wait.return_argument    = buffer;
-  executing->Wait.return_argument_1  = (void *)size;
+  executing->Wait.queue = &the_message_queue->Wait_queue;
+  executing->Wait.id = id;
+  executing->Wait.return_argument_second.mutable_object = buffer;
+  executing->Wait.return_argument = size_p;
   /* Wait.count will be filled in with the message priority */
   _ISR_Enable( level );
 
diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c
index 2f1ea815ca..9882d1c811 100644
--- a/cpukit/score/src/coremsgsubmit.c
+++ b/cpukit/score/src/coremsgsubmit.c
@@ -59,7 +59,7 @@
 
 CORE_message_queue_Status _CORE_message_queue_Submit(
   CORE_message_queue_Control                *the_message_queue,
-  void                                      *buffer,
+  const void                                *buffer,
   size_t                                     size,
   Objects_Id                                 id,
   CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
@@ -85,10 +85,10 @@ CORE_message_queue_Status _CORE_message_queue_Submit(
     if ( the_thread ) {
       _CORE_message_queue_Copy_buffer(
         buffer,
-        the_thread->Wait.return_argument,
+        the_thread->Wait.return_argument_second.mutable_object,
         size
       );
-      *(size_t *)the_thread->Wait.return_argument_1 = size;
+      *(size_t *) the_thread->Wait.return_argument = size;
       the_thread->Wait.count = submit_type;
 
 #if defined(RTEMS_MULTIPROCESSING)
@@ -165,11 +165,11 @@ CORE_message_queue_Status _CORE_message_queue_Submit(
 
     _ISR_Disable( level );
     _Thread_queue_Enter_critical_section( &the_message_queue->Wait_queue );
-    executing->Wait.queue              = &the_message_queue->Wait_queue;
-    executing->Wait.id                 = id;
-    executing->Wait.return_argument    = buffer;
-    executing->Wait.option             = size;
-    executing->Wait.count              = submit_type;
+    executing->Wait.queue = &the_message_queue->Wait_queue;
+    executing->Wait.id = id;
+    executing->Wait.return_argument_second.immutable_object = buffer;
+    executing->Wait.option = (uint32_t) size;
+    executing->Wait.count = submit_type;
     _ISR_Enable( level );
 
     _Thread_queue_Enqueue( &the_message_queue->Wait_queue, timeout );
diff --git a/cpukit/score/src/objectgetinfo.c b/cpukit/score/src/objectgetinfo.c
index c7d7d81b06..033f827891 100644
--- a/cpukit/score/src/objectgetinfo.c
+++ b/cpukit/score/src/objectgetinfo.c
@@ -24,11 +24,16 @@ Objects_Information *_Objects_Get_information(
 )
 {
   Objects_Information *info;
+  int the_class_api_maximum;
 
   if ( !_Objects_Is_api_valid( the_api ) )
     return NULL;
 
-  if ( !the_class || the_class > _Objects_API_maximum_class(the_api) )
+  if ( !the_class )
+    return NULL;
+
+  the_class_api_maximum = _Objects_API_maximum_class( the_api );
+  if ( the_class_api_maximum < 0 || the_class > (uint32_t) the_class_api_maximum )
     return NULL;
 
   if ( !_Objects_Information_table[ the_api ] )