1 files changed, 4 insertions, 83 deletions
diff --git a/c/src/exec/rtems/src/mp.c b/c/src/exec/rtems/src/mp.c
index c555ffb3f1..f17d3b13e6 100644
--- a/c/src/exec/rtems/src/mp.c
+++ b/c/src/exec/rtems/src/mp.c
@@ -14,23 +14,9 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/config.h>
-#include <rtems/cpu.h>
-#include <rtems/event.h>
-#include <rtems/fatal.h>
-#include <rtems/intthrd.h>
-#include <rtems/message.h>
-#include <rtems/mp.h>
-#include <rtems/mpci.h>
-#include <rtems/mppkt.h>
-#include <rtems/part.h>
-#include <rtems/sem.h>
-#include <rtems/signal.h>
-#include <rtems/states.h>
-#include <rtems/tasks.h>
-#include <rtems/thread.h>
-#include <rtems/threadq.h>
-#include <rtems/watchdog.h>
+#include <rtems/rtems/status.h>
+#include <rtems/rtems/mp.h>
+#include <rtems/core/mpci.h>
 
 /*PAGE
  *
@@ -40,11 +26,6 @@
 
 void _Multiprocessing_Manager_initialization ( void )
 {
-  if ( _Configuration_MP_table->node < 1 ||
-       _Configuration_MP_table->node > _Configuration_MP_table->maximum_nodes )
-     rtems_fatal_error_occurred( RTEMS_INVALID_NODE );
-
-  _Internal_threads_Set_MP_receive_server( _Multiprocessing_Receive_server );
 }
 
 /*PAGE
@@ -55,67 +36,7 @@ void _Multiprocessing_Manager_initialization ( void )
 
 void rtems_multiprocessing_announce ( void )
 {
-  _Thread_Disable_dispatch();
-  _Event_sets_Post(
-    RTEMS_EVENT_0,
-    &_Internal_threads_System_initialization_thread->RTEMS_API->pending_events
-  );
-  _Event_Surrender( _Internal_threads_System_initialization_thread );
-  _Thread_Enable_dispatch();
-}
-
-/*PAGE
- *
- *  _Multiprocessing_Receive_server
- *
- */
-
-typedef void (*packet_processor)( rtems_packet_prefix * );
-
-packet_processor _Multiprocessor_Packet_processors[] = {
-  _Internal_threads_MP_Process_packet, /* RTEMS_MP_PACKET_INTERNAL_THREADS */
-  _RTEMS_tasks_MP_Process_packet,      /* RTEMS_MP_PACKET_TASKS */
-  _Message_queue_MP_Process_packet,    /* RTEMS_MP_PACKET_MESSAGE_QUEUE */
-  _Semaphore_MP_Process_packet,        /* RTEMS_MP_PACKET_SEMAPHORE */
-  _Partition_MP_Process_packet,        /* RTEMS_MP_PACKET_PARTITION */
-  0,                                   /* RTEMS_MP_PACKET_REGION */
-  _Event_MP_Process_packet,            /* RTEMS_MP_PACKET_EVENT */
-  _Signal_MP_Process_packet            /* RTEMS_MP_PACKET_SIGNAL */
-};
-
-Thread _Multiprocessing_Receive_server (
-  Thread_Argument ignored
-)
-{
-
-  rtems_packet_prefix *the_packet;
-  packet_processor     the_function;
-
-  for ( ; ; ) {
-
-    _Thread_Disable_dispatch();
-    _Event_Seize( RTEMS_EVENT_0, RTEMS_DEFAULT_OPTIONS, RTEMS_NO_TIMEOUT );
-    _Thread_Enable_dispatch();
-
-    for ( ; ; ) {
-      the_packet = _MPCI_Receive_packet();
-
-      if ( !the_packet ) 
-        break;
-
-      _Thread_Executing->receive_packet = the_packet;
-
-      if ( !_Mp_packet_Is_valid_packet_class ( the_packet->the_class ) )
-        break;
-
-      the_function = _Multiprocessor_Packet_processors[ the_packet->the_class ];
-    
-      if ( !the_function )
-        break;
-
-      (*the_function)( the_packet );
-    }
-  }
+  _MPCI_Announce();
 }
 
 /* end of file */