From 9520ec3a2aab575e264410d1ce95c468897c3bc9 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 14 Feb 2020 09:31:44 +0100 Subject: config: Simplify initialization task config With the removal of the CONFIGURE_HAS_OWN_INIT_TASK_TABLE configuration option at most one Classic API user initialization task can be configured. Provide an RTEMS API configuration table for backward compatibility. Update #3873. --- cpukit/libmisc/monitor/mon-config.c | 4 +++- cpukit/libmisc/monitor/mon-itask.c | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'cpukit/libmisc') diff --git a/cpukit/libmisc/monitor/mon-config.c b/cpukit/libmisc/monitor/mon-config.c index 95b7798173..d7728de33a 100644 --- a/cpukit/libmisc/monitor/mon-config.c +++ b/cpukit/libmisc/monitor/mon-config.c @@ -29,7 +29,9 @@ rtems_monitor_config_canonical( const void *config_void ) { - rtems_api_configuration_table *r = &Configuration_RTEMS_API; + const rtems_api_configuration_table *r; + + r = rtems_configuration_get_rtems_api_configuration(); canonical_config->work_space_size = rtems_configuration_get_work_space_size(); canonical_config->maximum_tasks = rtems_configuration_get_maximum_tasks(); diff --git a/cpukit/libmisc/monitor/mon-itask.c b/cpukit/libmisc/monitor/mon-itask.c index 39103320ab..f4d3aea170 100644 --- a/cpukit/libmisc/monitor/mon-itask.c +++ b/cpukit/libmisc/monitor/mon-itask.c @@ -40,15 +40,17 @@ rtems_monitor_init_task_next( rtems_id *next_id ) { - rtems_initialization_tasks_table *itask; + const rtems_api_configuration_table *config; + const rtems_initialization_tasks_table *itask; uint32_t n = rtems_object_id_get_index(*next_id); - if (n >= Configuration_RTEMS_API.number_of_initialization_tasks) + config = rtems_configuration_get_rtems_api_configuration(); + if (n >= config->number_of_initialization_tasks) goto failed; _Objects_Allocator_lock(); - itask = Configuration_RTEMS_API.User_initialization_tasks_table + n; + itask = config->User_initialization_tasks_table + n; /* * dummy up a fake id and name for this item -- cgit v1.2.3