diff options
| author | Marin Ramesa <mpr@hi.t-com.hr> | 2013-12-08 12:40:16 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-12-09 00:52:08 +0900 |
| commit | cd79da88b148c79cec94f214c4efd07dd8069863 (patch) | |
| tree | b11a9e186808fc1cba8f05225a86cfa443017eb7 | |
| parent | 039ae1184c7cc855e0435004ef8d5933424be43d (diff) | |
i386/i386at/kd.c: use io_req instead of uio
Struct uio is nowhere defined and in device/buf.h the string uio is defined
as io_req. Remove all declarations of uio structure and use io_req_t instead
of it.
* device/buf.h (uio, io_req): Remove definition.
* i386/i386at/kd.c: Remove comment.
(kdread): Use io_req_t.
(kdwrite): Likewise.
* i386/i386at/kd.h (kdread, kdwrite): Use io_req_t as argument type.
| -rw-r--r-- | device/buf.h | 5 | ||||
| -rw-r--r-- | i386/i386at/kd.c | 6 | ||||
| -rw-r--r-- | i386/i386at/kd.h | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/device/buf.h b/device/buf.h index 806eb8d..a79ed8e 100644 --- a/device/buf.h +++ b/device/buf.h @@ -83,11 +83,6 @@ #define B_MD1 IO_SPARE_START /* - * Redefine uio structure - */ -#define uio io_req - -/* * Redefine physio routine */ #define physio(strat, xbuf, dev, ops, minphys, ior) \ diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c index 14524bf..757bce2 100644 --- a/i386/i386at/kd.c +++ b/i386/i386at/kd.c @@ -83,7 +83,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <device/conf.h> #include <device/tty.h> #include <device/io_req.h> -#include <device/buf.h> /* for struct uio (!) */ +#include <device/buf.h> #include <vm/vm_kern.h> #include <i386/locore.h> #include <i386/loose_ends.h> @@ -526,7 +526,7 @@ int flag; int kdread(dev, uio) int dev; -struct uio *uio; +io_req_t uio; { struct tty *tp; @@ -551,7 +551,7 @@ struct uio *uio; int kdwrite(dev, uio) int dev; -struct uio *uio; +io_req_t uio; { return((*linesw[kd_tty.t_line].l_write)(&kd_tty, uio)); } diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h index 9d297d1..f5cd5fc 100644 --- a/i386/i386at/kd.h +++ b/i386/i386at/kd.h @@ -750,8 +750,8 @@ extern void kdb_kintr(void); extern int kdopen(dev_t dev, int flag, io_req_t ior); extern void kdclose(int dev, int flag); -extern int kdread(int dev, struct uio *uio); -extern int kdwrite(int dev, struct uio *uio); +extern int kdread(int dev, io_req_t uio); +extern int kdwrite(int dev, io_req_t uio); extern io_return_t kdgetstat( dev_t dev, |