summaryrefslogtreecommitdiffstats
path: root/cpukit/sapi
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-12-17 22:46:05 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-12-17 22:46:05 +0000
commit790b50b8da754eba39e2c21d67bb9b14df966080 (patch)
tree7f8386fb4eb796d8dc60e421e07f9059278012d2 /cpukit/sapi
parent2008-12-17 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-790b50b8da754eba39e2c21d67bb9b14df966080.tar.bz2
2008-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* sapi/include/rtems/extension.h, sapi/include/rtems/io.h, sapi/src/exinit.c, sapi/src/extension.c, sapi/src/io.c, score/include/rtems/score/mpci.h, score/include/rtems/score/object.h, score/include/rtems/score/thread.h, score/include/rtems/score/tod.h, score/include/rtems/score/userext.h, score/include/rtems/score/wkspace.h, score/src/coretod.c, score/src/mpci.c, score/src/object.c, score/src/thread.c, score/src/userext.c, score/src/wkspace.c: Convert SAPI manager and SuperCore Handler initialization routines to directly pull parameters from configuration table.
Diffstat (limited to 'cpukit/sapi')
-rw-r--r--cpukit/sapi/include/rtems/extension.h6
-rw-r--r--cpukit/sapi/include/rtems/io.h8
-rw-r--r--cpukit/sapi/src/exinit.c52
-rw-r--r--cpukit/sapi/src/extension.c12
-rw-r--r--cpukit/sapi/src/io.c18
5 files changed, 31 insertions, 65 deletions
diff --git a/cpukit/sapi/include/rtems/extension.h b/cpukit/sapi/include/rtems/extension.h
index a1f448c98e..0d62c1df55 100644
--- a/cpukit/sapi/include/rtems/extension.h
+++ b/cpukit/sapi/include/rtems/extension.h
@@ -13,7 +13,7 @@
* + get ID of user extension set
* + delete user extension set
*
- * COPYRIGHT (c) 1989-2007.
+ * COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -82,9 +82,7 @@ typedef struct {
* This routine performs the initialization necessary for this manager.
*/
-void _Extension_Manager_initialization(
- uint32_t maximum_extensions
-);
+void _Extension_Manager_initialization(void);
/*
* rtems_extension_create
diff --git a/cpukit/sapi/include/rtems/io.h b/cpukit/sapi/include/rtems/io.h
index e96a2f6333..05b954c779 100644
--- a/cpukit/sapi/include/rtems/io.h
+++ b/cpukit/sapi/include/rtems/io.h
@@ -17,7 +17,7 @@
*/
/*
- * COPYRIGHT (c) 1989-1999.
+ * COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -103,11 +103,7 @@ SAPI_IO_EXTERN rtems_driver_address_table *_IO_Driver_address_table;
* This routine performs the initialization necessary for this manager.
*/
-void _IO_Manager_initialization(
- rtems_driver_address_table *driver_table,
- uint32_t drivers_in_table,
- uint32_t number_of_drivers
-);
+void _IO_Manager_initialization(void);
/*
* rtems_io_register_driver
diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c
index 4a86dfd240..b2378032de 100644
--- a/cpukit/sapi/src/exinit.c
+++ b/cpukit/sapi/src/exinit.c
@@ -111,67 +111,37 @@ void rtems_initialize_data_structures(void)
* Before this is called, we are not allowed to allocate memory
* from the Workspace because it is not initialized.
*/
- _Workspace_Handler_initialization(
- Configuration.work_space_start,
- Configuration.work_space_size
- );
-
- _User_extensions_Handler_initialization(
- Configuration.number_of_initial_extensions,
- Configuration.User_extension_table
- );
+ _Workspace_Handler_initialization();
+ _User_extensions_Handler_initialization();
_ISR_Handler_initialization();
-
- _Objects_Handler_initialization(
- #if defined(RTEMS_MULTIPROCESSING)
- _Configuration_MP_table->node,
- _Configuration_MP_table->maximum_nodes,
- _Configuration_MP_table->maximum_global_objects
- #endif
- );
-
- _Objects_Information_table[OBJECTS_INTERNAL_API] = _Internal_Objects;
+ _Objects_Handler_initialization();
/*
- * Initialize the internal allocator Mutex
+ * Initialize the internal support API and allocator Mutex
*/
+ _Objects_Information_table[OBJECTS_INTERNAL_API] = _Internal_Objects;
+
_API_Mutex_Initialization( 1 );
_API_Mutex_Allocate( &_RTEMS_Allocator_Mutex );
_Priority_Handler_initialization();
-
_Watchdog_Handler_initialization();
+ _TOD_Handler_initialization();
- _TOD_Handler_initialization( Configuration.microseconds_per_tick );
-
- _Thread_Handler_initialization(
- Configuration.ticks_per_timeslice,
- Configuration.maximum_extensions
- #if defined(RTEMS_MULTIPROCESSING)
- ,
- _Configuration_MP_table->maximum_proxies
- #endif
- );
+ _Thread_Handler_initialization();
#if defined(RTEMS_MULTIPROCESSING)
- _MPCI_Handler_initialization(
- _Configuration_MP_table->User_mpci_table,
- RTEMS_TIMEOUT
- );
+ _MPCI_Handler_initialization( RTEMS_TIMEOUT );
#endif
/* MANAGERS */
_RTEMS_API_Initialize();
- _Extension_Manager_initialization( Configuration.maximum_extensions );
+ _Extension_Manager_initialization();
- _IO_Manager_initialization(
- Configuration.Device_driver_table,
- Configuration.number_of_device_drivers,
- Configuration.maximum_drivers
- );
+ _IO_Manager_initialization();
#ifdef RTEMS_POSIX_API
_POSIX_API_Initialize();
diff --git a/cpukit/sapi/src/extension.c b/cpukit/sapi/src/extension.c
index 1a85cddf3a..993f415fd8 100644
--- a/cpukit/sapi/src/extension.c
+++ b/cpukit/sapi/src/extension.c
@@ -1,7 +1,7 @@
/*
* Extension Manager
*
- * COPYRIGHT (c) 1989-2007.
+ * COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -16,6 +16,7 @@
#endif
#include <rtems/system.h>
+#include <rtems/config.h>
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/score/thread.h>
@@ -27,21 +28,18 @@
*
* This routine initializes all extension manager related data structures.
*
- * Input parameters:
- * maximum_extensions - number of extensions to initialize
+ * Input parameters: NONE
*
* Output parameters: NONE
*/
-void _Extension_Manager_initialization(
- uint32_t maximum_extensions
-)
+void _Extension_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Extension_Information,
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_EXTENSIONS,
- maximum_extensions,
+ Configuration.maximum_extensions,
sizeof( Extension_Control ),
false, /* true if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
diff --git a/cpukit/sapi/src/io.c b/cpukit/sapi/src/io.c
index bd5cd4f0ec..c3cdf6ea7f 100644
--- a/cpukit/sapi/src/io.c
+++ b/cpukit/sapi/src/io.c
@@ -1,7 +1,7 @@
/*
* Input/Output Manager - Initialize Device Driver Subsystem
*
- * COPYRIGHT (c) 1989-2007.
+ * COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -16,6 +16,7 @@
#endif
#include <rtems/system.h>
+#include <rtems/config.h>
#include <rtems/io.h>
#include <rtems/score/isr.h>
#include <rtems/score/thread.h>
@@ -32,13 +33,16 @@
*
*/
-void _IO_Manager_initialization(
- rtems_driver_address_table *driver_table,
- uint32_t drivers_in_table,
- uint32_t number_of_drivers
-)
+void _IO_Manager_initialization(void)
{
- uint32_t index;
+ uint32_t index;
+ rtems_driver_address_table *driver_table;
+ uint32_t drivers_in_table;
+ uint32_t number_of_drivers;
+
+ driver_table = Configuration.Device_driver_table;
+ drivers_in_table = Configuration.number_of_device_drivers;
+ number_of_drivers = Configuration.maximum_drivers;
/*
* If the user claims there are less drivers than are actually in