diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-18 17:15:13 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-18 17:15:13 +0000 |
| commit | 584ab9e16e52b46ae65cb245fd86858824da4bb9 (patch) | |
| tree | e7c7808d1a6062c0f850c2fa3f1b388e04d76717 /cpukit/score/src | |
| parent | 2008-12-18 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-584ab9e16e52b46ae65cb245fd86858824da4bb9.tar.bz2 | |
2008-12-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* rtems/include/rtems/rtems/regionmp.h, sapi/include/rtems/config.h,
sapi/src/exinit.c, score/Makefile.am,
score/include/rtems/score/object.h,
score/include/rtems/score/objectmp.h, score/src/objectmp.c: Eliminate
Object Handler Initialization routine since it was all for MP
configurations.
* score/src/object.c: Removed.
Diffstat (limited to 'cpukit/score/src')
| -rw-r--r-- | cpukit/score/src/object.c | 70 | ||||
| -rw-r--r-- | cpukit/score/src/objectmp.c | 25 |
2 files changed, 20 insertions, 75 deletions
diff --git a/cpukit/score/src/object.c b/cpukit/score/src/object.c deleted file mode 100644 index f34739aa67..0000000000 --- a/cpukit/score/src/object.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Object Handler - * - * - * COPYRIGHT (c) 1989-2008. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include <rtems/system.h> -#include <rtems/config.h> -#include <rtems/score/address.h> -#include <rtems/score/chain.h> -#include <rtems/score/object.h> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/score/objectmp.h> -#endif -#include <rtems/score/thread.h> -#include <rtems/score/wkspace.h> -#include <rtems/score/sysstate.h> -#include <rtems/score/isr.h> - -/*PAGE - * - * _Objects_Handler_initialization - * - * This routine initializes the object handler. - * - * Input parameters: NONE - * - * Output parameters: NONE - */ - -void _Objects_Handler_initialization(void) -{ -#if defined(RTEMS_MULTIPROCESSING) - uint32_t node; - uint32_t maximum_nodes; - uint32_t maximum_global_objects; - - node = _Configuration_MP_table->node; - maximum_nodes = _Configuration_MP_table->maximum_nodes; - maximum_global_objects = _Configuration_MP_table->maximum_global_objects; - - if ( node < 1 || node > maximum_nodes ) - _Internal_error_Occurred( - INTERNAL_ERROR_CORE, - TRUE, - INTERNAL_ERROR_INVALID_NODE - ); - - _Objects_Local_node = node; - _Objects_Maximum_nodes = maximum_nodes; - - _Objects_MP_Handler_initialization( - node, - maximum_nodes, - maximum_global_objects - ); -#endif -} diff --git a/cpukit/score/src/objectmp.c b/cpukit/score/src/objectmp.c index 3447069760..58b52f93dc 100644 --- a/cpukit/score/src/objectmp.c +++ b/cpukit/score/src/objectmp.c @@ -17,6 +17,7 @@ #endif #include <rtems/system.h> +#include <rtems/config.h> #include <rtems/score/interr.h> #include <rtems/score/object.h> #include <rtems/score/wkspace.h> @@ -28,12 +29,26 @@ * */ -void _Objects_MP_Handler_initialization ( - uint32_t node, - uint32_t maximum_nodes, - uint32_t maximum_global_objects -) +void _Objects_MP_Handler_initialization(void) { + uint32_t node; + uint32_t maximum_nodes; + uint32_t maximum_global_objects; + + node = _Configuration_MP_table->node; + maximum_nodes = _Configuration_MP_table->maximum_nodes; + maximum_global_objects = _Configuration_MP_table->maximum_global_objects; + + if ( node < 1 || node > maximum_nodes ) + _Internal_error_Occurred( + INTERNAL_ERROR_CORE, + TRUE, + INTERNAL_ERROR_INVALID_NODE + ); + + + _Objects_Local_node = node; + _Objects_Maximum_nodes = maximum_nodes; _Objects_MP_Maximum_global_objects = maximum_global_objects; if ( maximum_global_objects == 0 ) { |