2009-09-11 Joel Sherrill <joel.sherrill@OARcorp.com>

	* score/include/rtems/score/coremsg.h,
	score/inline/rtems/score/coremsg.inl, score/src/coremsg.c,
	score/src/coremsginsert.c, score/src/coremsgseize.c,
	score/src/coremsgsubmit.c, score/src/objectnametoidstring.c: Disable
	the Core Message Queue features of notification, priority messages,
	and blocking sends when no API requires them.

1 files changed, 28 insertions, 35 deletions

diff --git a/cpukit/score/inline/rtems/score/coremsg.inl b/cpukit/score/inline/rtems/score/coremsg.inl
index 81955acbe4..bd961b3957 100644
--- a/cpukit/score/inline/rtems/score/coremsg.inl
+++ b/cpukit/score/inline/rtems/score/coremsg.inl
@@ -6,7 +6,7 @@
  */
 
 /*
- *  COPYRIGHT (c) 1989-2004.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -33,7 +33,6 @@
 /**
  *  This routine sends a message to the end of the specified message queue.
  */
- 
 RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Send(
   CORE_message_queue_Control                *the_message_queue,
   const void                                *buffer,
@@ -63,7 +62,6 @@ RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Send(
 /**
  *  This routine sends a message to the front of the specified message queue.
  */
- 
 RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Urgent(
   CORE_message_queue_Control                *the_message_queue,
   const void                                *buffer,
@@ -94,7 +92,6 @@ RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Urgent(
  *  This routine copies the contents of the source message buffer
  *  to the destination message buffer.
  */
-
 RTEMS_INLINE_ROUTINE void _CORE_message_queue_Copy_buffer (
   const void *source,
   void       *destination,
@@ -108,7 +105,6 @@ RTEMS_INLINE_ROUTINE void _CORE_message_queue_Copy_buffer (
  *  This function allocates a message buffer from the inactive
  *  message buffer chain.
  */
-
 RTEMS_INLINE_ROUTINE CORE_message_queue_Buffer_control *
 _CORE_message_queue_Allocate_message_buffer (
     CORE_message_queue_Control *the_message_queue
@@ -122,7 +118,6 @@ _CORE_message_queue_Allocate_message_buffer (
  *  This routine frees a message buffer to the inactive
  *  message buffer chain.
  */
-
 RTEMS_INLINE_ROUTINE void _CORE_message_queue_Free_message_buffer (
     CORE_message_queue_Control        *the_message_queue,
     CORE_message_queue_Buffer_control *the_message
@@ -135,7 +130,6 @@ RTEMS_INLINE_ROUTINE void _CORE_message_queue_Free_message_buffer (
  *  This function removes the first message from the_message_queue
  *  and returns a pointer to it.
  */
-
 RTEMS_INLINE_ROUTINE
   CORE_message_queue_Buffer_control *_CORE_message_queue_Get_pending_message (
   CORE_message_queue_Control *the_message_queue
@@ -149,19 +143,18 @@ RTEMS_INLINE_ROUTINE
  *  This function returns true if the priority attribute is
  *  enabled in the attribute_set and false otherwise.
  */
- 
 RTEMS_INLINE_ROUTINE bool _CORE_message_queue_Is_priority(
   CORE_message_queue_Attributes *the_attribute
 )
 {
-  return (the_attribute->discipline == CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY);
+  return
+    (the_attribute->discipline == CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY);
 }
 
 /**
  *  This routine places the_message at the rear of the outstanding
  *  messages on the_message_queue.
  */
-
 RTEMS_INLINE_ROUTINE void _CORE_message_queue_Append_unprotected (
   CORE_message_queue_Control        *the_message_queue,
   CORE_message_queue_Buffer_control *the_message
@@ -177,7 +170,6 @@ RTEMS_INLINE_ROUTINE void _CORE_message_queue_Append_unprotected (
  *  This routine places the_message at the front of the outstanding
  *  messages on the_message_queue.
  */
-
 RTEMS_INLINE_ROUTINE void _CORE_message_queue_Prepend_unprotected (
   CORE_message_queue_Control        *the_message_queue,
   CORE_message_queue_Buffer_control *the_message
@@ -192,7 +184,6 @@ RTEMS_INLINE_ROUTINE void _CORE_message_queue_Prepend_unprotected (
 /**
  *  This function returns true if the_message_queue is true and false otherwise.
  */
-
 RTEMS_INLINE_ROUTINE bool _CORE_message_queue_Is_null (
   CORE_message_queue_Control *the_message_queue
 )
@@ -200,31 +191,33 @@ RTEMS_INLINE_ROUTINE bool _CORE_message_queue_Is_null (
   return ( the_message_queue == NULL  );
 }
 
-/**
- *  This function returns true if notification is enabled on this message
- *  queue and false otherwise.
- */
- 
-RTEMS_INLINE_ROUTINE bool _CORE_message_queue_Is_notify_enabled (
-  CORE_message_queue_Control *the_message_queue
-)
-{
-  return (the_message_queue->notify_handler != NULL);
-}
+#if defined(RTEMS_SCORE_COREMSG_ENABLE_NOTIFICATION)
+  /**
+   *  This function returns true if notification is enabled on this message
+   *  queue and false otherwise.
+   */
+  RTEMS_INLINE_ROUTINE bool _CORE_message_queue_Is_notify_enabled (
+    CORE_message_queue_Control *the_message_queue
+  )
+  {
+    return (the_message_queue->notify_handler != NULL);
+  }
  
-/**
- *  This routine initializes the notification information for the_message_queue.
- */
+  /**
+   *  This routine initializes the notification information for
+   *  @a the_message_queue.
+   */
  
-RTEMS_INLINE_ROUTINE void _CORE_message_queue_Set_notify (
-  CORE_message_queue_Control        *the_message_queue,
-  CORE_message_queue_Notify_Handler  the_handler,
-  void                              *the_argument
-)
-{
-  the_message_queue->notify_handler  = the_handler;
-  the_message_queue->notify_argument = the_argument;
-}
+  RTEMS_INLINE_ROUTINE void _CORE_message_queue_Set_notify (
+    CORE_message_queue_Control        *the_message_queue,
+    CORE_message_queue_Notify_Handler  the_handler,
+    void                              *the_argument
+  )
+  {
+    the_message_queue->notify_handler  = the_handler;
+    the_message_queue->notify_argument = the_argument;
+  }
+#endif
 
 /**@}*/