2008-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>

* rtems/Makefile.am, rtems/include/rtems/rtems/attr.h,
	rtems/include/rtems/rtems/barrier.h,
	rtems/include/rtems/rtems/dpmem.h, rtems/include/rtems/rtems/intr.h,
	rtems/include/rtems/rtems/message.h,
	rtems/include/rtems/rtems/part.h,
	rtems/include/rtems/rtems/ratemon.h,
	rtems/include/rtems/rtems/region.h, rtems/include/rtems/rtems/sem.h,
	rtems/include/rtems/rtems/tasks.h, rtems/include/rtems/rtems/timer.h,
	rtems/src/barrier.c, rtems/src/dpmem.c, rtems/src/msg.c,
	rtems/src/part.c, rtems/src/ratemon.c, rtems/src/region.c,
	rtems/src/rtemstimer.c, rtems/src/sem.c, rtems/src/tasks.c,
	sapi/src/rtemsapi.c: Convert manager initialization routines to
	directly pull parameters from configuration table. Eliminate empty
	routines sportted.
	* rtems/src/intr.c: Removed.
This commit is contained in:
Joel Sherrill
2008-12-17 20:21:40 +00:00
parent 07fdc9c2a3
commit db80f11c9c
24 changed files with 107 additions and 189 deletions
+18
View File
@@ -1,3 +1,21 @@
2008-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* rtems/Makefile.am, rtems/include/rtems/rtems/attr.h,
rtems/include/rtems/rtems/barrier.h,
rtems/include/rtems/rtems/dpmem.h, rtems/include/rtems/rtems/intr.h,
rtems/include/rtems/rtems/message.h,
rtems/include/rtems/rtems/part.h,
rtems/include/rtems/rtems/ratemon.h,
rtems/include/rtems/rtems/region.h, rtems/include/rtems/rtems/sem.h,
rtems/include/rtems/rtems/tasks.h, rtems/include/rtems/rtems/timer.h,
rtems/src/barrier.c, rtems/src/dpmem.c, rtems/src/msg.c,
rtems/src/part.c, rtems/src/ratemon.c, rtems/src/region.c,
rtems/src/rtemstimer.c, rtems/src/sem.c, rtems/src/tasks.c,
sapi/src/rtemsapi.c: Convert manager initialization routines to
directly pull parameters from configuration table. Eliminate empty
routines sportted.
* rtems/src/intr.c: Removed.
2008-12-17 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Remove include/rtems/stdint.h.
+1 -1
View File
@@ -78,7 +78,7 @@ librtems_a_SOURCES += src/ratemon.c src/ratemoncancel.c src/ratemoncreate.c \
src/ratemonperiod.c src/ratemontimeout.c src/ratemondata.c
## INTR_C_FILES
librtems_a_SOURCES += src/intr.c src/intrbody.c src/intrcatch.c
librtems_a_SOURCES += src/intrbody.c src/intrcatch.c
## BARRIER_C_FILES
librtems_a_SOURCES += src/barrier.c src/barriercreate.c src/barrierdelete.c \
-10
View File
@@ -182,16 +182,6 @@ typedef uint32_t rtems_attribute;
#define ATTRIBUTES_REQUIRED 0
#endif
/**
* @brief _Attributes_Handler_initialization
*
* This routine performs initialization for this handler.
*
* NOTE: There is no initialization required in C. Conditional compilation
* takes care of this in C.
*/
#define _Attributes_Handler_initialization()
#ifndef __RTEMS_APPLICATION__
#include <rtems/rtems/attr.inl>
#endif
+1 -6
View File
@@ -76,13 +76,8 @@ RTEMS_BARRIER_EXTERN Objects_Information _Barrier_Information;
* @brief _Barrier_Manager_initialization
*
* This routine performs the initialization necessary for this manager.
*
* @param[in] maximum_barriers is the total number of barriers allowed to
* concurrently be active in the system.
*/
void _Barrier_Manager_initialization(
uint32_t maximum_barriers
);
void _Barrier_Manager_initialization(void);
/**
* @brief rtems_barrier_create
+1 -3
View File
@@ -81,9 +81,7 @@ RTEMS_DPMEM_EXTERN Objects_Information _Dual_ported_memory_Information;
*
* This routine performs the initialization necessary for this manager.
*/
void _Dual_ported_memory_Manager_initialization(
uint32_t maximum_ports
);
void _Dual_ported_memory_Manager_initialization(void);
/**
* @brief rtems_port_create
-5
View File
@@ -57,11 +57,6 @@ typedef rtems_isr ( *rtems_isr_entry )(
rtems_vector_number
);
/**
* @brief Initializes the Interrupt Manager.
*/
void _Interrupt_Manager_initialization( void );
/**
* @brief Implementation of the rtems_interrupt_catch directive.
*
+1 -3
View File
@@ -101,9 +101,7 @@ RTEMS_MESSAGE_EXTERN Objects_Information _Message_queue_Information;
*
* This routine performs the initialization necessary for this manager.
*/
void _Message_queue_Manager_initialization(
uint32_t maximum_message_queues
);
void _Message_queue_Manager_initialization(void);
/**
* @brief rtems_message_queue_create
+1 -3
View File
@@ -88,9 +88,7 @@ RTEMS_PART_EXTERN Objects_Information _Partition_Information;
*
* This routine performs the initialization necessary for this manager.
*/
void _Partition_Manager_initialization(
uint32_t maximum_partitions
);
void _Partition_Manager_initialization(void);
/**
* @brief rtems_partition_create
+1 -3
View File
@@ -278,9 +278,7 @@ RTEMS_RATEMON_EXTERN Objects_Information _Rate_monotonic_Information;
*
* This routine performs the initialization necessary for this manager.
*/
void _Rate_monotonic_Manager_initialization(
uint32_t maximum_periods
);
void _Rate_monotonic_Manager_initialization(void);
/**
* @brief rtems_rate_monotonic_create
+1 -3
View File
@@ -88,9 +88,7 @@ RTEMS_REGION_EXTERN Objects_Information _Region_Information;
*
* This routine performs the initialization necessary for this manager.
*/
void _Region_Manager_initialization(
uint32_t maximum_regions
);
void _Region_Manager_initialization(void);
/**
* @brief rtems_region_create
+1 -3
View File
@@ -108,9 +108,7 @@ RTEMS_SEM_EXTERN Objects_Information _Semaphore_Information;
*
* This routine performs the initialization necessary for this manager.
*/
void _Semaphore_Manager_initialization(
uint32_t maximum_semaphores
);
void _Semaphore_Manager_initialization(void);
/**
* @brief rtems_semaphore_create
+1 -3
View File
@@ -241,9 +241,7 @@ extern void (*_RTEMS_tasks_Initialize_user_tasks_p)(void);
*
* This routine initializes all Task Manager related data structures.
*/
void _RTEMS_tasks_Manager_initialization(
uint32_t maximum_tasks
);
void _RTEMS_tasks_Manager_initialization(void);
/**
* @brief rtems_task_create
+1 -3
View File
@@ -148,9 +148,7 @@ typedef struct {
*
* This routine performs the initialization necessary for this manager.
*/
void _Timer_Manager_initialization(
uint32_t maximum_timers
);
void _Timer_Manager_initialization(void);
/**
* @brief rtems_timer_create
+6 -7
View File
@@ -13,7 +13,7 @@
* + acquire a barrier
* + release a barrier
*
* COPYRIGHT (c) 1989-2006.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -28,6 +28,7 @@
#endif
#include <rtems/system.h>
#include <rtems/config.h>
#include <rtems/rtems/status.h>
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
@@ -39,21 +40,19 @@
/**
* @brief _Barrier_Manager_initialization
*
* Input parameters:
* maximum_barriers - maximum configured barriers
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _Barrier_Manager_initialization(
uint32_t maximum_barriers
)
void _Barrier_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Barrier_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_BARRIERS, /* object class */
maximum_barriers, /* maximum objects of this class */
Configuration_RTEMS_API.maximum_barriers,
/* maximum objects of this class */
sizeof( Barrier_Control ), /* size of this object's control block */
FALSE, /* TRUE if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
+6 -7
View File
@@ -1,7 +1,7 @@
/*
* Dual Port Memory Manager
*
* COPYRIGHT (c) 1989-1999.
* 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/status.h>
#include <rtems/rtems/support.h>
#include <rtems/score/address.h>
@@ -30,21 +31,19 @@
* This routine initializes all dual-ported memory manager related
* data structures.
*
* Input parameters:
* maximum_ports - number of ports to initialize
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _Dual_ported_memory_Manager_initialization(
uint32_t maximum_ports
)
void _Dual_ported_memory_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Dual_ported_memory_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_PORTS, /* object class */
maximum_ports, /* maximum objects of this class */
Configuration_RTEMS_API.maximum_ports,
/* maximum objects of this class */
sizeof( Dual_ported_memory_Control ),
/* size of this object's control block */
FALSE, /* TRUE if names of this object are strings */
-35
View File
@@ -1,35 +0,0 @@
/*
* Interrupt Manager
*
*
* COPYRIGHT (c) 1989-1999.
* 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/rtems/status.h>
#include <rtems/score/isr.h>
#include <rtems/rtems/intr.h>
/* _Interrupt_Manager_initialization
*
* This routine initializes the interrupt manager.
*
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _Interrupt_Manager_initialization( void )
{
}
+12 -12
View File
@@ -2,7 +2,7 @@
* Message Queue Manager
*
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,6 +17,7 @@
#endif
#include <rtems/system.h>
#include <rtems/config.h>
#include <rtems/score/sysstate.h>
#include <rtems/score/chain.h>
#include <rtems/score/isr.h>
@@ -41,29 +42,28 @@
* This routine initializes all message queue manager related
* data structures.
*
* Input parameters:
* maximum_message_queues - number of message queues to initialize
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _Message_queue_Manager_initialization(
uint32_t maximum_message_queues
)
void _Message_queue_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Message_queue_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_MESSAGE_QUEUES, /* object class */
maximum_message_queues, /* maximum objects of this class */
Configuration_RTEMS_API.maximum_message_queues,
/* maximum objects of this class */
sizeof( Message_queue_Control ),
/* size of this object's control block */
FALSE, /* TRUE if names of this object are strings */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of each object's name */
/* size of this object's control block */
FALSE, /* TRUE if names of this object are strings */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of each object's name */
#if defined(RTEMS_MULTIPROCESSING)
,
TRUE, /* TRUE if this is a global object class */
_Message_queue_MP_Send_extract_proxy /* Proxy extraction support callout */
TRUE, /* TRUE if this is a global object class */
_Message_queue_MP_Send_extract_proxy
/* Proxy extraction support callout */
#endif
);
+6 -8
View File
@@ -1,8 +1,7 @@
/*
* Partition Manager
*
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,6 +16,7 @@
#endif
#include <rtems/system.h>
#include <rtems/config.h>
#include <rtems/rtems/status.h>
#include <rtems/rtems/support.h>
#include <rtems/score/address.h>
@@ -32,21 +32,19 @@
* This routine initializes all partition manager related
* data structures.
*
* Input parameters:
* maximum_partitions - number of partitions to initialize
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _Partition_Manager_initialization(
uint32_t maximum_partitions
)
void _Partition_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Partition_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_PARTITIONS, /* object class */
maximum_partitions, /* maximum objects of this class */
Configuration_RTEMS_API.maximum_partitions,
/* maximum objects of this class */
sizeof( Partition_Control ), /* size of this object's control block */
FALSE, /* TRUE if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
+14 -15
View File
@@ -2,7 +2,7 @@
* Rate Monotonic Manager
*
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,6 +17,7 @@
#endif
#include <rtems/system.h>
#include <rtems/config.h>
#include <rtems/rtems/status.h>
#include <rtems/rtems/support.h>
#include <rtems/score/isr.h>
@@ -31,8 +32,7 @@
* This routine initializes all Rate Monotonic Manager related
* data structures.
*
* Input parameters:
* maximum_periods - number of periods timers to initialize
* Input parameters: NONE
*
* Output parameters: NONE
*
@@ -40,22 +40,21 @@
* Handler.
*/
void _Rate_monotonic_Manager_initialization(
uint32_t maximum_periods
)
void _Rate_monotonic_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Rate_monotonic_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_PERIODS, /* object class */
maximum_periods, /* maximum objects of this class */
sizeof( Rate_monotonic_Control ), /* size of this object's control block */
FALSE, /* TRUE if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
&_Rate_monotonic_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_PERIODS, /* object class */
Configuration_RTEMS_API.maximum_periods,
/* maximum objects of this class */
sizeof( Rate_monotonic_Control ),/* size of this object's control block */
FALSE, /* TRUE if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
#if defined(RTEMS_MULTIPROCESSING)
,
FALSE, /* TRUE if this is a global object class */
NULL /* Proxy extraction support callout */
FALSE, /* TRUE if this is a global object class */
NULL /* Proxy extraction support callout */
#endif
);
}
+6 -7
View File
@@ -2,7 +2,7 @@
* Region Manager
*
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,6 +17,7 @@
#endif
#include <rtems/system.h>
#include <rtems/config.h>
#include <rtems/rtems/status.h>
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
@@ -32,21 +33,19 @@
*
* This routine initializes all region manager related data structures.
*
* Input parameters:
* maximum_regions - number of regions to initialize
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _Region_Manager_initialization(
uint32_t maximum_regions
)
void _Region_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Region_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_REGIONS, /* object class */
maximum_regions, /* maximum objects of this class */
Configuration_RTEMS_API.maximum_regions,
/* maximum objects of this class */
sizeof( Region_Control ), /* size of this object's control block */
FALSE, /* TRUE if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
+6 -7
View File
@@ -2,7 +2,7 @@
* Timer Manager
*
*
* COPYRIGHT (c) 1989-2002.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -17,6 +17,7 @@
#endif
#include <rtems/system.h>
#include <rtems/config.h>
#include <rtems/rtems/status.h>
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
@@ -31,21 +32,19 @@
*
* This routine initializes all timer manager related data structures.
*
* Input parameters:
* maximum_timers - number of timers to initialize
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _Timer_Manager_initialization(
uint32_t maximum_timers
)
void _Timer_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Timer_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_TIMERS, /* object class */
maximum_timers, /* maximum objects of this class */
Configuration_RTEMS_API.maximum_timers ,
/* maximum objects of this class */
sizeof( Timer_Control ), /* size of this object's control block */
FALSE, /* TRUE if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
+6 -7
View File
@@ -15,7 +15,7 @@
* + acquire a semaphore
* + release a semaphore
*
* COPYRIGHT (c) 1989-1999.
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -30,6 +30,7 @@
#endif
#include <rtems/system.h>
#include <rtems/config.h>
#include <rtems/rtems/status.h>
#include <rtems/rtems/support.h>
#include <rtems/rtems/attr.h>
@@ -55,21 +56,19 @@
*
* This routine initializes all semaphore manager related data structures.
*
* Input parameters:
* maximum_semaphores - maximum configured semaphores
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _Semaphore_Manager_initialization(
uint32_t maximum_semaphores
)
void _Semaphore_Manager_initialization(void)
{
_Objects_Initialize_information(
&_Semaphore_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_SEMAPHORES, /* object class */
maximum_semaphores, /* maximum objects of this class */
Configuration_RTEMS_API.maximum_semaphores,
/* maximum objects of this class */
sizeof( Semaphore_Control ), /* size of this object's control block */
FALSE, /* TRUE if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
+5 -8
View File
@@ -1,7 +1,7 @@
/*
* RTEMS Task Manager -- Initialize 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
@@ -241,22 +241,19 @@ User_extensions_Control _RTEMS_tasks_User_extensions = {
*
* This routine initializes all Task Manager related data structures.
*
* Input parameters:
* maximum_tasks - number of tasks to initialize
* Input parameters: NONE
*
* Output parameters: NONE
*/
void _RTEMS_tasks_Manager_initialization(
uint32_t maximum_tasks
)
void _RTEMS_tasks_Manager_initialization(void)
{
_Objects_Initialize_information(
&_RTEMS_tasks_Information, /* object information table */
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_TASKS, /* object class */
maximum_tasks, /* maximum objects of this class */
Configuration_RTEMS_API.maximum_tasks,
/* maximum objects of this class */
sizeof( Thread_Control ), /* size of this object's control block */
FALSE, /* TRUE if the name is a string */
RTEMS_MAXIMUM_NAME_LENGTH /* maximum length of an object name */
+12 -30
View File
@@ -56,45 +56,27 @@ Objects_Information *_RTEMS_Objects[ OBJECTS_RTEMS_CLASSES_LAST + 1 ];
void _RTEMS_API_Initialize(void)
{
rtems_api_configuration_table *api;
/*
* Install our API Object Management Table and initialize the
* various managers.
*/
api = &Configuration_RTEMS_API;
_Objects_Information_table[OBJECTS_CLASSIC_API] = _RTEMS_Objects;
_Attributes_Handler_initialization();
_Interrupt_Manager_initialization();
#if defined(RTEMS_MULTIPROCESSING)
_Multiprocessing_Manager_initialization();
#endif
_RTEMS_tasks_Manager_initialization( api->maximum_tasks );
_Timer_Manager_initialization( api->maximum_timers );
#if defined(RTEMS_MULTIPROCESSING)
_Multiprocessing_Manager_initialization();
#endif
_RTEMS_tasks_Manager_initialization();
_Timer_Manager_initialization();
_Signal_Manager_initialization();
_Event_Manager_initialization();
_Message_queue_Manager_initialization( api->maximum_message_queues );
_Semaphore_Manager_initialization( api->maximum_semaphores );
_Partition_Manager_initialization( api->maximum_partitions );
_Region_Manager_initialization( api->maximum_regions );
_Dual_ported_memory_Manager_initialization( api->maximum_ports);
_Rate_monotonic_Manager_initialization( api->maximum_periods );
_Barrier_Manager_initialization( api->maximum_barriers );
_Message_queue_Manager_initialization();
_Semaphore_Manager_initialization();
_Partition_Manager_initialization();
_Region_Manager_initialization();
_Dual_ported_memory_Manager_initialization();
_Rate_monotonic_Manager_initialization();
_Barrier_Manager_initialization();
}
/* end of file */