2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>

* score/include/rtems/score/mpci.h,
	score/inline/rtems/score/threadmp.inl, score/src/mpci.c: Eliminate
	dependencies between MP .h files.

cpukit/ChangeLog

@@ -1,3 +1,9 @@
+2008-09-05	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* score/include/rtems/score/mpci.h,
+	score/inline/rtems/score/threadmp.inl, score/src/mpci.c: Eliminate
+	dependencies between MP .h files.
+
 2008-09-05	Eric Norum <norume@aps.anl.gov>
 
 	* libfs/src/nfsclient/src/rpcio.c: Correct breakage introduced by Joel

cpukit/score/include/rtems/score/mpci.h

@@ -40,7 +40,6 @@ extern "C" {
 #include <rtems/score/threadq.h>
 #include <rtems/score/tqdata.h>
 #include <rtems/score/watchdog.h>
-#include <rtems/score/coresem.h>
 
 /**
  *  The following defines the node number used when a broadcast is desired.
@@ -168,11 +167,6 @@ typedef struct {
   uint32_t                         maximum_global_objects;
 }    MPCI_Internal_packet;
 
-/**
- *  This is the core semaphore which the MPCI Receive Server blocks on.
- */
-SCORE_EXTERN CORE_semaphore_Control _MPCI_Semaphore;
-
 /**
  *  The following thread queue is used to maintain a list of tasks
  *  which currently have outstanding remote requests.

cpukit/score/inline/rtems/score/threadmp.inl

@@ -33,14 +33,12 @@
 /**
  *  This function returns true if the thread in question is the
  *  multiprocessing receive thread.
+ *
+ *  @note This is a macro to avoid needing a prototype for 
+ *        _MPCI_Receive_server_tcb until it is used.
  */
-
-RTEMS_INLINE_ROUTINE bool _Thread_MP_Is_receive (
-  Thread_Control *the_thread
-)
-{
-  return the_thread == _MPCI_Receive_server_tcb;
-}
+#define _Thread_MP_Is_receive(_the_thread) \
+  (_the_thread == _MPCI_Receive_server_tcb)
 
 /**
  *  This routine frees a proxy control block to the

cpukit/score/src/mpci.c

@@ -33,6 +33,11 @@
 #include <rtems/score/coresem.h>
 #include <rtems/config.h>
 
+/**
+ *  This is the core semaphore which the MPCI Receive Server blocks on.
+ */
+CORE_semaphore_Control _MPCI_Semaphore;
+
 /*PAGE
  *
  *  _MPCI_Handler_initialization