diff options
Diffstat (limited to 'c/src/lib')
19 files changed, 31 insertions, 29 deletions
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c index e522a852f7..76b73c7222 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c @@ -377,7 +377,7 @@ bsp_start(void) * Add 1 region for RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; #ifdef RTEMS_NEWLIB /* diff --git a/c/src/lib/libbsp/i386/force386/startup/bspstart.c b/c/src/lib/libbsp/i386/force386/startup/bspstart.c index d2349f9fc7..04a9bae415 100644 --- a/c/src/lib/libbsp/i386/force386/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/force386/startup/bspstart.c @@ -194,7 +194,7 @@ int main( * Add 1 region for Malloc in libc_low */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/i386/go32/startup/bspstart.c b/c/src/lib/libbsp/i386/go32/startup/bspstart.c index c4575f81d4..9f20f4a4e5 100644 --- a/c/src/lib/libbsp/i386/go32/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/go32/startup/bspstart.c @@ -194,7 +194,7 @@ int main( * Add 1 region for Malloc in libc_low */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c index 7316f46f54..60fd38d969 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c +++ b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c @@ -208,7 +208,7 @@ int main( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c index 0cc4ae8e60..f004407312 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c @@ -216,7 +216,7 @@ int main( * Add 1 region for Malloc in libc_low */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c b/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c index 82dbb94638..f5eb9fbcbd 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c @@ -189,7 +189,7 @@ int main( * Add 1 region for Malloc in libc_low */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c b/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c index 6e93953bc6..b3e33c16d0 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c @@ -199,7 +199,7 @@ int main( * Add 1 region for Malloc in libc_low */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c index 307dc04d1e..f8cb057317 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c @@ -180,7 +180,7 @@ int main( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c index bbf1185f06..d35ca4d5cf 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c @@ -177,7 +177,7 @@ int main( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index 2c71a1d8e9..6fff075174 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c @@ -223,7 +223,7 @@ int main( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c index 40f9c171cb..950630e9ee 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c @@ -206,7 +206,7 @@ int main( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c index 826d4075f8..ce0ed9b354 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c @@ -212,7 +212,7 @@ int main( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c index bc26a8be93..7cbfd6f83b 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c @@ -220,7 +220,7 @@ int main( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c index 8ab251b791..e43bc7fb17 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c @@ -177,7 +177,7 @@ int bsp_start( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c index 9358e77ee8..e8faaa2904 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c @@ -195,7 +195,7 @@ int bsp_start( * Add 1 region for the RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; /* * Add 1 extension for newlib libc diff --git a/c/src/lib/libbsp/unix/posix/startup/bspstart.c b/c/src/lib/libbsp/unix/posix/startup/bspstart.c index 8f8344523a..6135c202fe 100644 --- a/c/src/lib/libbsp/unix/posix/startup/bspstart.c +++ b/c/src/lib/libbsp/unix/posix/startup/bspstart.c @@ -323,7 +323,7 @@ bsp_start(void) * Add 1 region for RTEMS Malloc */ - BSP_Configuration.maximum_regions++; + BSP_Configuration.RTEMS_api_configuration->maximum_regions++; #ifdef RTEMS_NEWLIB /* diff --git a/c/src/lib/libc/libio.c b/c/src/lib/libc/libio.c index 202d1f9275..547f7ac377 100644 --- a/c/src/lib/libc/libio.c +++ b/c/src/lib/libc/libio.c @@ -90,8 +90,9 @@ rtems_libio_config( * tweak config to reflect # of semaphores we will need */ - config->maximum_semaphores += 1; /* one for iop table */ - config->maximum_semaphores += max_fds; + /* one for iop table */ + config->RTEMS_api_configuration->maximum_semaphores += 1; + config->RTEMS_api_configuration->maximum_semaphores += max_fds; } /* diff --git a/c/src/lib/libmisc/monitor/mon-config.c b/c/src/lib/libmisc/monitor/mon-config.c index f5c9f6f093..d7593dc912 100644 --- a/c/src/lib/libmisc/monitor/mon-config.c +++ b/c/src/lib/libmisc/monitor/mon-config.c @@ -29,21 +29,22 @@ rtems_monitor_config_canonical( ) { rtems_configuration_table *c = (rtems_configuration_table *) config_void; + rtems_api_configuration_table *r = c->RTEMS_api_configuration; canonical_config->work_space_start = c->work_space_start; canonical_config->work_space_size = c->work_space_size; - canonical_config->maximum_tasks = c->maximum_tasks; - canonical_config->maximum_timers = c->maximum_timers; - canonical_config->maximum_semaphores = c->maximum_semaphores; - canonical_config->maximum_message_queues = c->maximum_message_queues; - canonical_config->maximum_partitions = c->maximum_partitions; - canonical_config->maximum_regions = c->maximum_regions; - canonical_config->maximum_ports = c->maximum_ports; - canonical_config->maximum_periods = c->maximum_periods; + canonical_config->maximum_tasks = r->maximum_tasks; + canonical_config->maximum_timers = r->maximum_timers; + canonical_config->maximum_semaphores = r->maximum_semaphores; + canonical_config->maximum_message_queues = r->maximum_message_queues; + canonical_config->maximum_partitions = r->maximum_partitions; + canonical_config->maximum_regions = r->maximum_regions; + canonical_config->maximum_ports = r->maximum_ports; + canonical_config->maximum_periods = r->maximum_periods; canonical_config->maximum_extensions = c->maximum_extensions; canonical_config->microseconds_per_tick = c->microseconds_per_tick; canonical_config->ticks_per_timeslice = c->ticks_per_timeslice; - canonical_config->number_of_initialization_tasks = c->number_of_initialization_tasks; + canonical_config->number_of_initialization_tasks = r->number_of_initialization_tasks; } /* diff --git a/c/src/lib/libmisc/monitor/mon-itask.c b/c/src/lib/libmisc/monitor/mon-itask.c index 5ce4b55270..8d7b48277e 100644 --- a/c/src/lib/libmisc/monitor/mon-itask.c +++ b/c/src/lib/libmisc/monitor/mon-itask.c @@ -42,12 +42,12 @@ rtems_monitor_init_task_next( rtems_initialization_tasks_table *itask; int n = rtems_get_index(*next_id); - if (n >= c->number_of_initialization_tasks) + if (n >= c->RTEMS_api_configuration->number_of_initialization_tasks) goto failed; _Thread_Disable_dispatch(); - itask = c->User_initialization_tasks_table + n; + itask = c->RTEMS_api_configuration->User_initialization_tasks_table + n; /* * dummy up a fake id and name for this item |