[PATCH 14/28] i386/i386at/kd.c: use io_req instead of uio

[Marin Ramesa]

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.

---
 device/buf.h     | 5 -----
 i386/i386at/kd.c | 6 +++---
 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 5605257..27be23a 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 d97fdd5..2cb9280 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,
-- 
1.8.1.4