config: Add _MPCI_Configuration

Replace the user MPCI configuration table with a system provided
_MPCI_Configuration.

Update #3735.

1 files changed, 3 insertions, 60 deletions

diff --git a/cpukit/include/rtems/config.h b/cpukit/include/rtems/config.h
index 23fad8d83c..15e944dd2f 100644
--- a/cpukit/include/rtems/config.h
+++ b/cpukit/include/rtems/config.h
@@ -35,7 +35,7 @@
 #include <rtems/posix/config.h>
 #include <rtems/extension.h>
 #if defined(RTEMS_MULTIPROCESSING)
-#include <rtems/score/mpci.h>
+#include <rtems/rtems/types.h>
 #endif
 
 #ifdef __cplusplus
@@ -53,35 +53,6 @@ extern "C" {
 #define rtems_resource_maximum_per_allocation(resource) \
   _Objects_Maximum_per_allocation(resource)
 
-#if defined(RTEMS_MULTIPROCESSING)
-/*
- *  The following records define the Multiprocessor Configuration
- *  Table.  This table defines the multiprocessor system
- *  characteristics which must be known by RTEMS in a multiprocessor
- *  system.
- */
-typedef struct {
-  /** This is the local node number. */
-  uint32_t            node;
-  /** This is the maximum number of nodes in system. */
-  uint32_t            maximum_nodes;
-  /** This is the maximum number of global objects. */
-  uint32_t            maximum_global_objects;
-  /** This is the maximum number of proxies. */
-  uint32_t            maximum_proxies;
-
-  /** 
-   * The MPCI Receive server is assumed to have a stack of at least
-   * minimum stack size.  This field specifies the amount of extra
-   * stack this task will be given in bytes.
-   */
-  uint32_t            extra_mpci_receive_server_stack;
-
-  /** This is a pointer to User/BSP provided MPCI Table. */
-  rtems_mpci_table   *User_mpci_table;
-} rtems_multiprocessing_table;
-#endif
-
 /**
  * @brief Task stack allocator initialization hook.
  *
@@ -206,9 +177,6 @@ typedef struct {
     bool                         smp_enabled;
   #endif
 
-  #if defined(RTEMS_MULTIPROCESSING)
-    rtems_multiprocessing_table   *User_multiprocessing_table;
-  #endif
   #ifdef RTEMS_SMP
     uint32_t                     maximum_processors;
   #endif
@@ -219,31 +187,6 @@ typedef struct {
  */
 extern const rtems_configuration_table Configuration;
 
-#if defined(RTEMS_MULTIPROCESSING)
-  /**
-   *  This points to the multiprocessing configuration table.
-   */
-  extern rtems_multiprocessing_table *_Configuration_MP_table;
-#endif
-
-#if defined(RTEMS_MULTIPROCESSING)
-  /**
-   * @brief RTEMS multiprocessing configuration table.
-   *
-   * This is the RTEMS Multiprocessing Configuration Table expected to
-   * be generated by confdefs.h.
-   */
-  extern rtems_multiprocessing_table Multiprocessing_configuration;
-
-  /*
-   *  This is the default Multiprocessing Configuration Table.
-   *  It is used in single processor configurations.
-   */
-  extern const rtems_multiprocessing_table
-    _Initialization_Default_multiprocessing_table;
-#endif
-
-
 /*
  *  Some handy macros to avoid dependencies on either the BSP
  *  or the exact format of the configuration table.
@@ -308,10 +251,10 @@ uint32_t rtems_configuration_get_maximum_extensions( void );
 
 #if defined(RTEMS_MULTIPROCESSING)
   #define rtems_configuration_get_user_multiprocessing_table() \
-        (Configuration.User_multiprocessing_table)
+    (&_MPCI_Configuration)
 #else
   #define rtems_configuration_get_user_multiprocessing_table() \
-        NULL
+    NULL
 #endif
 
 /**