diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-12-12 07:11:54 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-12-13 08:35:17 +0100 |
| commit | 24f8915a079446918abd4f7b2a8e1b8385930f85 (patch) | |
| tree | 708417a866d436b619e471d834b56f95109eb66f /cpukit/include/rtems/confdefs.h | |
| parent | rtems: Add and use rtems_object_get_local_node() (diff) | |
| download | rtems-24f8915a079446918abd4f7b2a8e1b8385930f85.tar.bz2 | |
config: Add _MPCI_Configuration
Replace the user MPCI configuration table with a system provided
_MPCI_Configuration.
Update #3735.
Diffstat (limited to 'cpukit/include/rtems/confdefs.h')
| -rw-r--r-- | cpukit/include/rtems/confdefs.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 4e65f5df68..692470c024 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -1842,7 +1842,15 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; #endif #ifdef CONFIGURE_INIT - rtems_multiprocessing_table Multiprocessing_configuration = { + #if CONFIGURE_MP_NODE_NUMBER < 1 + #error "CONFIGURE_MP_NODE_NUMBER must be greater than or equal to one" + #endif + + #if CONFIGURE_MP_NODE_NUMBER > CONFIGURE_MP_MAXIMUM_NODES + #error "CONFIGURE_MP_NODE_NUMBER must be less than or equal to CONFIGURE_MP_MAXIMUM_NODES" + #endif + + const MPCI_Configuration _MPCI_Configuration = { CONFIGURE_MP_NODE_NUMBER, /* local node number */ CONFIGURE_MP_MAXIMUM_NODES, /* maximum # nodes */ CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS, /* maximum # global objects */ @@ -1852,11 +1860,8 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; }; #endif - #define CONFIGURE_MULTIPROCESSING_TABLE &Multiprocessing_configuration - #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1 #else - #define CONFIGURE_MULTIPROCESSING_TABLE NULL #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0 #endif /* CONFIGURE_MP_APPLICATION */ #else @@ -2878,9 +2883,6 @@ struct _reent *__getreent(void) false, #endif #endif - #if defined(RTEMS_MULTIPROCESSING) - CONFIGURE_MULTIPROCESSING_TABLE, /* pointer to MP config table */ - #endif #ifdef RTEMS_SMP _CONFIGURE_MAXIMUM_PROCESSORS, #endif |