diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-12-11 15:57:49 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-12-13 08:22:58 +0100 |
| commit | d24b30156d00cfa997abb2453e86e0e8643f4df9 (patch) | |
| tree | 5935fc96d663f69b5f96c30d0a32c4f7c6603fd7 /cpukit | |
| parent | config: Add CONFIGURE_IMFS_ENABLE_MKFIFO (diff) | |
| download | rtems-d24b30156d00cfa997abb2453e86e0e8643f4df9.tar.bz2 | |
config: CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE
Obsolete the CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE configuration
option.
Update #3735.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/include/rtems/confdefs.h | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index 23caa17707..4e65f5df68 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -1812,53 +1812,49 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; */ #ifdef CONFIGURE_MP_APPLICATION - #ifndef CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE - - #ifndef CONFIGURE_MP_NODE_NUMBER - #define CONFIGURE_MP_NODE_NUMBER NODE_NUMBER - #endif - - #ifndef CONFIGURE_MP_MAXIMUM_NODES - #define CONFIGURE_MP_MAXIMUM_NODES 2 - #endif + #ifndef CONFIGURE_MP_NODE_NUMBER + #define CONFIGURE_MP_NODE_NUMBER NODE_NUMBER + #endif - #ifndef CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS - #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS 32 - #endif - #define _CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(_global_objects) \ - _Configure_From_workspace( \ - (_global_objects) * sizeof(Objects_MP_Control) \ - ) + #ifndef CONFIGURE_MP_MAXIMUM_NODES + #define CONFIGURE_MP_MAXIMUM_NODES 2 + #endif - #ifndef CONFIGURE_MP_MAXIMUM_PROXIES - #define CONFIGURE_MP_MAXIMUM_PROXIES 32 - #endif - #define _CONFIGURE_MEMORY_FOR_PROXIES(_proxies) \ - _Configure_From_workspace((_proxies) \ - * (sizeof(Thread_Proxy_control) \ - + sizeof(Thread_queue_Configured_heads))) - - #ifndef CONFIGURE_MP_MPCI_TABLE_POINTER - #include <mpci.h> - #define CONFIGURE_MP_MPCI_TABLE_POINTER &MPCI_table - #endif + #ifndef CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS + #define CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS 32 + #endif + #define _CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(_global_objects) \ + _Configure_From_workspace( \ + (_global_objects) * sizeof(Objects_MP_Control) \ + ) - #ifdef CONFIGURE_INIT - rtems_multiprocessing_table Multiprocessing_configuration = { - CONFIGURE_MP_NODE_NUMBER, /* local node number */ - CONFIGURE_MP_MAXIMUM_NODES, /* maximum # nodes */ - CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS, /* maximum # global objects */ - CONFIGURE_MP_MAXIMUM_PROXIES, /* maximum # proxies */ - CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK, /* MPCI stack > minimum */ - CONFIGURE_MP_MPCI_TABLE_POINTER /* ptr to MPCI config table */ - }; - #endif + #ifndef CONFIGURE_MP_MAXIMUM_PROXIES + #define CONFIGURE_MP_MAXIMUM_PROXIES 32 + #endif + #define _CONFIGURE_MEMORY_FOR_PROXIES(_proxies) \ + _Configure_From_workspace((_proxies) \ + * (sizeof(Thread_Proxy_control) \ + + sizeof(Thread_queue_Configured_heads))) + + #ifndef CONFIGURE_MP_MPCI_TABLE_POINTER + #include <mpci.h> + #define CONFIGURE_MP_MPCI_TABLE_POINTER &MPCI_table + #endif - #define CONFIGURE_MULTIPROCESSING_TABLE &Multiprocessing_configuration + #ifdef CONFIGURE_INIT + rtems_multiprocessing_table Multiprocessing_configuration = { + CONFIGURE_MP_NODE_NUMBER, /* local node number */ + CONFIGURE_MP_MAXIMUM_NODES, /* maximum # nodes */ + CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS, /* maximum # global objects */ + CONFIGURE_MP_MAXIMUM_PROXIES, /* maximum # proxies */ + CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK, /* MPCI stack > minimum */ + CONFIGURE_MP_MPCI_TABLE_POINTER /* ptr to MPCI config table */ + }; + #endif - #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1 + #define CONFIGURE_MULTIPROCESSING_TABLE &Multiprocessing_configuration - #endif /* CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE */ + #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1 #else #define CONFIGURE_MULTIPROCESSING_TABLE NULL #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0 @@ -3134,6 +3130,10 @@ struct _reent *__getreent(void) #warning "The CONFIGURE_HAS_OWN_MOUNT_TABLE configuration option is obsolete since RTEMS 5.1" #endif +#ifdef CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE + #warning "The CONFIGURE_HAS_OWN_MOUNT_TABLE configuration option is obsolete since RTEMS 5.1" +#endif + #ifdef CONFIGURE_NUMBER_OF_TERMIOS_PORTS #warning "The CONFIGURE_NUMBER_OF_TERMIOS_PORTS configuration option is obsolete since RTEMS 5.1" #endif |