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/libmisc/monitor | |
| 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/libmisc/monitor')
| -rw-r--r-- | cpukit/libmisc/monitor/mon-monitor.c | 3 | ||||
| -rw-r--r-- | cpukit/libmisc/monitor/mon-mpci.c | 15 | ||||
| -rw-r--r-- | cpukit/libmisc/monitor/mon-server.c | 4 |
3 files changed, 7 insertions, 15 deletions
diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c index a990548e61..9c099dc57c 100644 --- a/cpukit/libmisc/monitor/mon-monitor.c +++ b/cpukit/libmisc/monitor/mon-monitor.c @@ -360,8 +360,7 @@ void rtems_monitor_node_cmd( } if ((new_node >= 1) && - _Configuration_MP_table && - (new_node <= _Configuration_MP_table->maximum_nodes)) + (new_node <= _MPCI_Configuration.maximum_nodes)) rtems_monitor_default_node = new_node; } #endif diff --git a/cpukit/libmisc/monitor/mon-mpci.c b/cpukit/libmisc/monitor/mon-mpci.c index 1ede142e52..9616518473 100644 --- a/cpukit/libmisc/monitor/mon-mpci.c +++ b/cpukit/libmisc/monitor/mon-mpci.c @@ -28,13 +28,10 @@ rtems_monitor_mpci_canonical( const void *config_void ) { - const rtems_configuration_table *c = &Configuration; - rtems_multiprocessing_table *m; - rtems_mpci_table *mt; + const rtems_multiprocessing_table *m; + const rtems_mpci_table *mt; - m = c->User_multiprocessing_table; - if (m == 0) - return; + m = rtems_configuration_get_user_multiprocessing_table(); mt = m->User_mpci_table; canonical_mpci->node = m->node; @@ -70,19 +67,15 @@ rtems_monitor_mpci_next( rtems_id *next_id ) { - const rtems_configuration_table *c = &Configuration; int n = rtems_object_id_get_index(*next_id); if (n >= 1) goto failed; - if ( ! c->User_multiprocessing_table) - goto failed; - _Objects_Allocator_lock(); *next_id += 1; - return (void *) c; + return &Configuration; failed: *next_id = RTEMS_OBJECT_ID_FINAL; diff --git a/cpukit/libmisc/monitor/mon-server.c b/cpukit/libmisc/monitor/mon-server.c index 3cb6cdf7ce..d8a1687f0b 100644 --- a/cpukit/libmisc/monitor/mon-server.c +++ b/cpukit/libmisc/monitor/mon-server.c @@ -221,9 +221,9 @@ rtems_monitor_server_init( rtems_status_code status; if (_System_state_Is_multiprocessing && - (_Configuration_MP_table->maximum_nodes > 1)) + (_MPCI_Configuration.maximum_nodes > 1)) { - uint32_t maximum_nodes = _Configuration_MP_table->maximum_nodes; + uint32_t maximum_nodes = _MPCI_Configuration.maximum_nodes; /* * create the msg que our server will listen |