diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 14:50:10 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 14:50:10 +0000 |
| commit | 26f5aa0598cfb5df9457b1a26458079caa2201cb (patch) | |
| tree | 343ad035ee7d40d75d0da311b8d37d9d7f34a07d /cpukit | |
| parent | 2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-26f5aa0598cfb5df9457b1a26458079caa2201cb.tar.bz2 | |
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.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/mpci.h | 6 | ||||
| -rw-r--r-- | cpukit/score/inline/rtems/score/threadmp.inl | 12 | ||||
| -rw-r--r-- | cpukit/score/src/mpci.c | 5 |
4 files changed, 16 insertions, 13 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 3de40d3856..4808f47f55 100644 --- a/cpukit/ChangeLog +++ b/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 diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/score/include/rtems/score/mpci.h index 09e2aea52c..1b65c3adc7 100644 --- a/cpukit/score/include/rtems/score/mpci.h +++ b/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. @@ -169,11 +168,6 @@ typedef struct { } 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. */ diff --git a/cpukit/score/inline/rtems/score/threadmp.inl b/cpukit/score/inline/rtems/score/threadmp.inl index c54a22ba3b..648ed0e1d2 100644 --- a/cpukit/score/inline/rtems/score/threadmp.inl +++ b/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 diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c index 828ad766e5..d767962781 100644 --- a/cpukit/score/src/mpci.c +++ b/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 |