Use linker set for MPCI initialization

Update #2408.

3 files changed, 5 insertions, 43 deletions

diff --git a/cpukit/score/include/rtems/score/basedefs.h b/cpukit/score/include/rtems/score/basedefs.h
index ea7d8c7c91..ef36e293a4 100644
--- a/cpukit/score/include/rtems/score/basedefs.h
+++ b/cpukit/score/include/rtems/score/basedefs.h
@@ -82,20 +82,6 @@
 #endif
 
 /**
- *  The following ensures that all data is declared in the space
- *  of the initialization routine for either the Initialization Manager
- *  or the initialization file for the appropriate API.  It is
- *  referenced as "external" in every other file.
- */
-#ifdef SAPI_INIT
-  #undef  SAPI_EXTERN
-  #define SAPI_EXTERN
-#else
-  #undef  SAPI_EXTERN
-  #define SAPI_EXTERN  extern
-#endif
-
-/**
  *  The following (in conjunction with compiler arguments) are used
  *  to choose between the use of static inline functions and macro
  *  functions.   The static inline implementation allows better
diff --git a/cpukit/score/include/rtems/score/mpciimpl.h b/cpukit/score/include/rtems/score/mpciimpl.h
index 600500ceee..33cb656972 100644
--- a/cpukit/score/include/rtems/score/mpciimpl.h
+++ b/cpukit/score/include/rtems/score/mpciimpl.h
@@ -100,33 +100,6 @@ SCORE_EXTERN MPCI_Packet_processor
                _MPCI_Packet_processors[MP_PACKET_CLASSES_LAST+1];
 
 /**
- *  @brief Initialize the MPCI handler.
- *
- *  This routine performs the initialization necessary for this handler.
- *
- *  @param[in] timeout_status is the value which should be returned to
- *             blocking threads when they timeout on a remote operation.
- */
-void _MPCI_Handler_initialization(
-  uint32_t   timeout_status
-);
-
-/**
- *  @brief Create the MPCI server thread.
- *
- *  This routine creates the packet receive server used in MP systems.
- */
-void _MPCI_Create_server( void );
-
-/**
- *  @brief Initialize the MPCI driver.
- *
- *  This routine initializes the MPCI driver by
- *  invoking the user provided MPCI initialization callout.
- */
-void _MPCI_Initialization ( void );
-
-/**
  *  This routine registers the MPCI packet processor for the
  *  designated object class.
  *
diff --git a/cpukit/score/include/rtems/sysinit.h b/cpukit/score/include/rtems/sysinit.h
index 925593da1a..37f001ae20 100644
--- a/cpukit/score/include/rtems/sysinit.h
+++ b/cpukit/score/include/rtems/sysinit.h
@@ -29,8 +29,10 @@ extern "C" {
 #define RTEMS_SYSINIT_BSP_WORK_AREAS             000100
 #define RTEMS_SYSINIT_BSP_START                  000200
 #define RTEMS_SYSINIT_INITIAL_EXTENSIONS         000300
-#define RTEMS_SYSINIT_DATA_STRUCTURES            000301
+#define RTEMS_SYSINIT_MP_EARLY                   000301
+#define RTEMS_SYSINIT_DATA_STRUCTURES            000302
 #define RTEMS_SYSINIT_CPU_SET                    00030d
+#define RTEMS_SYSINIT_MP                         00030e
 #define RTEMS_SYSINIT_USER_EXTENSIONS            000320
 #define RTEMS_SYSINIT_CLASSIC_TASKS              000340
 #define RTEMS_SYSINIT_CLASSIC_TIMER              000341
@@ -59,13 +61,14 @@ extern "C" {
 #define RTEMS_SYSINIT_LIBIO                      000400
 #define RTEMS_SYSINIT_ROOT_FILESYSTEM            000401
 #define RTEMS_SYSINIT_DRVMGR                     000500
-#define RTEMS_SYSINIT_BEFORE_DRIVERS             000501
+#define RTEMS_SYSINIT_MP_SERVER                  000501
 #define RTEMS_SYSINIT_BSP_PRE_DRIVERS            000600
 #define RTEMS_SYSINIT_DRVMGR_LEVEL_1             000700
 #define RTEMS_SYSINIT_DEVICE_DRIVERS             000701
 #define RTEMS_SYSINIT_DRVMGR_LEVEL_2             000702
 #define RTEMS_SYSINIT_DRVMGR_LEVEL_3             000703
 #define RTEMS_SYSINIT_DRVMGR_LEVEL_4             000704
+#define RTEMS_SYSINIT_MP_FINALIZE                000705
 #define RTEMS_SYSINIT_STD_FILE_DESCRIPTORS       000800
 
 /*