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

2000-09-28 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* include/rtems/io.h (rtems_driver_address_table): Added "_entry"
	to all names.
	* src/io.c: Accounted for above.
This commit is contained in:
Joel Sherrill
2000-09-28 20:22:40 +00:00
parent 9c3fa30a11
commit 2e61938324
6 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,9 @@
2000-09-28 Joel Sherrill <joel@OARcorp.com>
* include/rtems/io.h (rtems_driver_address_table): Added "_entry"
to all names.
* src/io.c: Accounted for above.
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* src/Makefile.am, optman/Makefile.am: Include compile.am. * src/Makefile.am, optman/Makefile.am: Include compile.am.

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

@@ -57,12 +57,12 @@ typedef rtems_device_driver ( *rtems_device_driver_entry )(
); );
typedef struct { typedef struct {
rtems_device_driver_entry initialization; /* initialization procedure */ rtems_device_driver_entry initialization_entry; /* initialization procedure */
rtems_device_driver_entry open; /* open request procedure */ rtems_device_driver_entry open_entry; /* open request procedure */
rtems_device_driver_entry close; /* close request procedure */ rtems_device_driver_entry close_entry; /* close request procedure */
rtems_device_driver_entry read; /* read request procedure */ rtems_device_driver_entry read_entry; /* read request procedure */
rtems_device_driver_entry write; /* write request procedure */ rtems_device_driver_entry write_entry; /* write request procedure */
rtems_device_driver_entry control; /* special functions procedure */ rtems_device_driver_entry control_entry; /* special functions procedure */
} rtems_driver_address_table; } rtems_driver_address_table;
/* /*

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

@@ -192,7 +192,7 @@ rtems_status_code rtems_io_initialize(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].initialization; callout = _IO_Driver_address_table[major].initialization_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -222,7 +222,7 @@ rtems_status_code rtems_io_open(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].open; callout = _IO_Driver_address_table[major].open_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -252,7 +252,7 @@ rtems_status_code rtems_io_close(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].close; callout = _IO_Driver_address_table[major].close_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -282,7 +282,7 @@ rtems_status_code rtems_io_read(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].read; callout = _IO_Driver_address_table[major].read_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -312,7 +312,7 @@ rtems_status_code rtems_io_write(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].write; callout = _IO_Driver_address_table[major].write_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -342,7 +342,7 @@ rtems_status_code rtems_io_control(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].control; callout = _IO_Driver_address_table[major].control_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }

6
cpukit/sapi/ChangeLog
View File

@@ -1,3 +1,9 @@
2000-09-28 Joel Sherrill <joel@OARcorp.com>
* include/rtems/io.h (rtems_driver_address_table): Added "_entry"
to all names.
* src/io.c: Accounted for above.
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* src/Makefile.am, optman/Makefile.am: Include compile.am. * src/Makefile.am, optman/Makefile.am: Include compile.am.

12
cpukit/sapi/include/rtems/io.h
View File

@@ -57,12 +57,12 @@ typedef rtems_device_driver ( *rtems_device_driver_entry )(
); );
typedef struct { typedef struct {
rtems_device_driver_entry initialization; /* initialization procedure */ rtems_device_driver_entry initialization_entry; /* initialization procedure */
rtems_device_driver_entry open; /* open request procedure */ rtems_device_driver_entry open_entry; /* open request procedure */
rtems_device_driver_entry close; /* close request procedure */ rtems_device_driver_entry close_entry; /* close request procedure */
rtems_device_driver_entry read; /* read request procedure */ rtems_device_driver_entry read_entry; /* read request procedure */
rtems_device_driver_entry write; /* write request procedure */ rtems_device_driver_entry write_entry; /* write request procedure */
rtems_device_driver_entry control; /* special functions procedure */ rtems_device_driver_entry control_entry; /* special functions procedure */
} rtems_driver_address_table; } rtems_driver_address_table;
/* /*

12
cpukit/sapi/src/io.c
View File

@@ -192,7 +192,7 @@ rtems_status_code rtems_io_initialize(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].initialization; callout = _IO_Driver_address_table[major].initialization_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -222,7 +222,7 @@ rtems_status_code rtems_io_open(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].open; callout = _IO_Driver_address_table[major].open_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -252,7 +252,7 @@ rtems_status_code rtems_io_close(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].close; callout = _IO_Driver_address_table[major].close_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -282,7 +282,7 @@ rtems_status_code rtems_io_read(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].read; callout = _IO_Driver_address_table[major].read_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -312,7 +312,7 @@ rtems_status_code rtems_io_write(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].write; callout = _IO_Driver_address_table[major].write_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }
@@ -342,7 +342,7 @@ rtems_status_code rtems_io_control(
if ( major >= _IO_Number_of_drivers ) if ( major >= _IO_Number_of_drivers )
return RTEMS_INVALID_NUMBER; return RTEMS_INVALID_NUMBER;
callout = _IO_Driver_address_table[major].control; callout = _IO_Driver_address_table[major].control_entry;
return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL; return callout ? callout(major, minor, argument) : RTEMS_SUCCESSFUL;
} }