RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-10-16 Chris Johns <ccj@acm.org>

Browse Source 
* include/confdefs.h, include/rtems/config.h, include/rtems/io.h,
	optman/no-io.c, src/exinit.c, src/io.c: Added a device driver
	register/unregister interface to allow device drivers to be
	installed and removed at runtime. This means you do not need devices
	present in the device table when you build.
This commit is contained in:
Joel Sherrill
2001-10-16 19:05:29 +00:00
parent 8917506d1c
commit 059a371409
14 changed files with 394 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/exec/sapi/ChangeLog
View File

@@ -1,3 +1,11 @@
2001-10-16 Chris Johns <ccj@acm.org>
* include/confdefs.h, include/rtems/config.h, include/rtems/io.h,
optman/no-io.c, src/exinit.c, src/io.c: Added a device driver
register/unregister interface to allow device drivers to be
installed and removed at runtime. This means you do not need devices
present in the device table when you build.
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/Makefile.am: Remove.

10
c/src/exec/sapi/include/confdefs.h
View File

@@ -299,6 +299,15 @@ rtems_driver_address_table Device_drivers[] = {
#endif /* CONFIGURE_HAS_OWN_DEVICE_DRIVER_TABLE */
/*
* Default the number of drivers per node. This value may be
* overridden by the user.
*/
#ifndef CONFIGURE_MAXIMUM_DRIVERS
#define CONFIGURE_MAXIMUM_DRIVERS 10
#endif
/*
* Default the number of devices per device driver. This value may be
* overridden by the user.
@@ -993,6 +1002,7 @@ rtems_configuration_table Configuration = {
CONFIGURE_MICROSECONDS_PER_TICK,
CONFIGURE_TICKS_PER_TIMESLICE,
CONFIGURE_MAXIMUM_DEVICES,
CONFIGURE_MAXIMUM_DRIVERS,
sizeof (Device_drivers)/
sizeof(rtems_driver_address_table), /* number of device drivers */
Device_drivers, /* pointer to driver table */

1
c/src/exec/sapi/include/rtems/config.h
View File

@@ -104,6 +104,7 @@ typedef struct {
unsigned32 microseconds_per_tick;
unsigned32 ticks_per_timeslice;
unsigned32 maximum_devices;
unsigned32 maximum_drivers;
unsigned32 number_of_device_drivers;
rtems_driver_address_table *Device_driver_table;
unsigned32 number_of_initial_extensions;

29
c/src/exec/sapi/include/rtems/io.h
View File

@@ -100,10 +100,39 @@ SAPI_EXTERN rtems_driver_name_t *_IO_Driver_name_table;
void _IO_Manager_initialization(
rtems_driver_address_table *driver_table,
unsigned32 drivers_in_table,
unsigned32 number_of_drivers,
unsigned32 number_of_devices
);
/*
* rtems_io_register_driver
*
* DESCRIPTION:
*
* Register a driver into the device driver table.
*
*/
rtems_status_code rtems_io_register_driver(
rtems_device_major_number major,
rtems_driver_address_table *driver_table,
rtems_device_major_number *registered_major
);
/*
* rtems_io_unregister_driver
*
* DESCRIPTION:
*
* Unregister a driver from the device driver table.
*
*/
rtems_status_code rtems_io_unregister_driver(
rtems_device_major_number major
);
/*
* rtems_io_register_name
*

27
c/src/exec/sapi/optman/no-io.c
View File

@@ -21,6 +21,7 @@
void _IO_Manager_initialization(
rtems_driver_address_table *driver_table,
unsigned32 drivers_in_table,
unsigned32 number_of_drivers,
unsigned32 number_of_devices
)
@@ -31,6 +32,32 @@ void _IO_Initialize_all_drivers( void )
{
}
rtems_status_code rtems_io_register_driver(
rtems_device_major_number major,
rtems_driver_address_table *driver_table,
rtems_device_major_number *registered_major
)
{
_Internal_error_Occurred(
INTERNAL_ERROR_RTEMS_API,
FALSE,
RTEMS_NOT_CONFIGURED
);
return RTEMS_NOT_CONFIGURED;
}
rtems_status_code rtems_io_unregister_driver(
rtems_device_major_number major
)
{
_Internal_error_Occurred(
INTERNAL_ERROR_RTEMS_API,
FALSE,
RTEMS_NOT_CONFIGURED
);
return RTEMS_NOT_CONFIGURED;
}
rtems_status_code rtems_io_register_name(
char *device_name,
rtems_device_major_number major,

1
c/src/exec/sapi/src/exinit.c
View File

@@ -205,6 +205,7 @@ rtems_interrupt_level rtems_initialize_executive_early(
_IO_Manager_initialization(
configuration_table->Device_driver_table,
configuration_table->number_of_device_drivers,
configuration_table->maximum_drivers,
configuration_table->maximum_devices
);

130
c/src/exec/sapi/src/io.c
View File

@@ -24,22 +24,44 @@
*
* _IO_Manager_initialization
*
* The IO manager has been extended to support runtime driver
* registration. The driver table is now allocated in the
* workspace.
*
*/
void _IO_Manager_initialization(
rtems_driver_address_table *driver_table,
unsigned32 number_of_drivers,
unsigned32 number_of_devices
rtems_driver_address_table *driver_table,
unsigned32 drivers_in_table,
unsigned32 number_of_drivers,
unsigned32 number_of_devices
)
{
void *tmp;
unsigned32 index;
rtems_driver_name_t *np;
if ( number_of_drivers < drivers_in_table )
number_of_drivers = drivers_in_table;
tmp = _Workspace_Allocate_or_fatal_error(
sizeof( rtems_driver_address_table ) * ( number_of_drivers )
);
_IO_Driver_address_table = driver_table;
_IO_Number_of_drivers = number_of_drivers;
_IO_Number_of_devices = number_of_devices;
_IO_Driver_address_table = (rtems_driver_address_table *) tmp;
memset(
_IO_Driver_address_table, 0,
sizeof( rtems_driver_address_table ) * ( number_of_drivers )
);
if ( drivers_in_table )
for ( index = 0 ; index < drivers_in_table ; index++ )
_IO_Driver_address_table[index] = driver_table[index];
_IO_Number_of_drivers = number_of_drivers;
_IO_Number_of_devices = number_of_devices;
tmp = _Workspace_Allocate_or_fatal_error(
sizeof( rtems_driver_name_t ) * ( number_of_devices + 1 )
);
@@ -75,6 +97,96 @@ void _IO_Initialize_all_drivers( void )
(void) rtems_io_initialize( major, 0, NULL);
}
/*PAGE
*
* rtems_io_register_driver
*
* Register a driver into the device driver table.
*
* Input Paramters:
* major - device major number (0 means allocate
* a number)
* driver_table - driver callout function table
* registered_major - the major number which is registered
*
* Output Parameters:
* RTEMS_SUCCESSFUL - if successful
* error code - if unsuccessful
*/
rtems_status_code rtems_io_register_driver(
rtems_device_major_number major,
rtems_driver_address_table *driver_table,
rtems_device_major_number *registered_major
)
{
*registered_major = 0;
/*
* Test for initialise/open being present to indicate the driver slot is
* in use.
*/
if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER;
if ( major == 0 )
{
for ( major = _IO_Number_of_drivers - 1 ; major ; major-- )
if ( _IO_Driver_address_table[major].initialization_entry == 0 &&
_IO_Driver_address_table[major].open_entry == 0 )
break;
if (( major == 0 ) &&
( _IO_Driver_address_table[major].initialization_entry == 0 &&
_IO_Driver_address_table[major].open_entry == 0 ))
return RTEMS_TOO_MANY;
}
if ( _IO_Driver_address_table[major].initialization_entry == 0 &&
_IO_Driver_address_table[major].open_entry == 0 )
{
_IO_Driver_address_table[major] = *driver_table;
*registered_major = major;
rtems_io_initialize( major, 0, NULL);
return RTEMS_SUCCESSFUL;
}
return RTEMS_RESOURCE_IN_USE;
}
/*PAGE
*
* rtems_io_unregister_driver
*
* Unregister a driver from the device driver table.
*
* Input Paramters:
* major - device major number
*
* Output Parameters:
* RTEMS_SUCCESSFUL - if successful
* error code - if unsuccessful
*/
rtems_status_code rtems_io_unregister_driver(
rtems_device_major_number major
)
{
if ( major < _IO_Number_of_drivers )
{
memset(
&_IO_Driver_address_table[major],
0,
sizeof( rtems_driver_address_table )
);
return RTEMS_SUCCESSFUL;
}
return RTEMS_UNSATISFIED;
}
/*PAGE
*
* rtems_io_register_name
@@ -184,7 +296,7 @@ rtems_status_code rtems_io_lookup_name(
rtems_status_code rtems_io_initialize(
rtems_device_major_number major,
rtems_device_minor_number minor,
void *argument
void *argument
)
{
rtems_device_driver_entry callout;

27
c/src/optman/sapi/no-io.c
View File

@@ -21,6 +21,7 @@
void _IO_Manager_initialization(
rtems_driver_address_table *driver_table,
unsigned32 drivers_in_table,
unsigned32 number_of_drivers,
unsigned32 number_of_devices
)
@@ -31,6 +32,32 @@ void _IO_Initialize_all_drivers( void )
{
}
rtems_status_code rtems_io_register_driver(
rtems_device_major_number major,
rtems_driver_address_table *driver_table,
rtems_device_major_number *registered_major
)
{
_Internal_error_Occurred(
INTERNAL_ERROR_RTEMS_API,
FALSE,
RTEMS_NOT_CONFIGURED
);
return RTEMS_NOT_CONFIGURED;
}
rtems_status_code rtems_io_unregister_driver(
rtems_device_major_number major
)
{
_Internal_error_Occurred(
INTERNAL_ERROR_RTEMS_API,
FALSE,
RTEMS_NOT_CONFIGURED
);
return RTEMS_NOT_CONFIGURED;
}
rtems_status_code rtems_io_register_name(
char *device_name,
rtems_device_major_number major,