summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-09-28 20:22:40 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-09-28 20:22:40 +0000
commit2e619383246dcdf5f43165e844710ec426c5df1f (patch)
tree94395b4442526e3e63a3ae917b6c31d281ecd9ed /c
parent2000-09-28 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-2e619383246dcdf5f43165e844710ec426c5df1f.tar.bz2
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.
Diffstat (limited to 'c')
-rw-r--r--c/src/exec/sapi/ChangeLog6
-rw-r--r--c/src/exec/sapi/include/rtems/io.h12
-rw-r--r--c/src/exec/sapi/src/io.c12
3 files changed, 18 insertions, 12 deletions
diff --git a/c/src/exec/sapi/ChangeLog b/c/src/exec/sapi/ChangeLog
index 3a003192eb..064f91632b 100644
--- a/c/src/exec/sapi/ChangeLog
+++ b/c/src/exec/sapi/ChangeLog
@@ -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>
* src/Makefile.am, optman/Makefile.am: Include compile.am.
diff --git a/c/src/exec/sapi/include/rtems/io.h b/c/src/exec/sapi/include/rtems/io.h
index 55a9aac7b4..4d8b3c027c 100644
--- a/c/src/exec/sapi/include/rtems/io.h
+++ b/c/src/exec/sapi/include/rtems/io.h
@@ -57,12 +57,12 @@ typedef rtems_device_driver ( *rtems_device_driver_entry )(
);
typedef struct {
- rtems_device_driver_entry initialization; /* initialization procedure */
- rtems_device_driver_entry open; /* open request procedure */
- rtems_device_driver_entry close; /* close request procedure */
- rtems_device_driver_entry read; /* read request procedure */
- rtems_device_driver_entry write; /* write request procedure */
- rtems_device_driver_entry control; /* special functions procedure */
+ rtems_device_driver_entry initialization_entry; /* initialization procedure */
+ rtems_device_driver_entry open_entry; /* open request procedure */
+ rtems_device_driver_entry close_entry; /* close request procedure */
+ rtems_device_driver_entry read_entry; /* read request procedure */
+ rtems_device_driver_entry write_entry; /* write request procedure */
+ rtems_device_driver_entry control_entry; /* special functions procedure */
} rtems_driver_address_table;
/*
diff --git a/c/src/exec/sapi/src/io.c b/c/src/exec/sapi/src/io.c
index f79189f060..ff876f663d 100644
--- a/c/src/exec/sapi/src/io.c
+++ b/c/src/exec/sapi/src/io.c
@@ -192,7 +192,7 @@ rtems_status_code rtems_io_initialize(
if ( major >= _IO_Number_of_drivers )
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;
}
@@ -222,7 +222,7 @@ rtems_status_code rtems_io_open(
if ( major >= _IO_Number_of_drivers )
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;
}
@@ -252,7 +252,7 @@ rtems_status_code rtems_io_close(
if ( major >= _IO_Number_of_drivers )
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;
}
@@ -282,7 +282,7 @@ rtems_status_code rtems_io_read(
if ( major >= _IO_Number_of_drivers )
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;
}
@@ -312,7 +312,7 @@ rtems_status_code rtems_io_write(
if ( major >= _IO_Number_of_drivers )
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;
}
@@ -342,7 +342,7 @@ rtems_status_code rtems_io_control(
if ( major >= _IO_Number_of_drivers )
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;
}