Fix benign type mismatches in devsw functions. 82 out of 299 devsw

functions were wrong.

14 files changed, 100 insertions, 77 deletions

diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index c17a64f..aac5aa7 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.9 1994/08/06 10:25:34 davidg Exp $
+ *	$Id: mem.c,v 1.10 1995/09/03 05:43:04 julian Exp $
  */
 
 /*
@@ -85,10 +85,11 @@ SYSINIT(memdev,SI_SUB_DEVFS, SI_ORDER_ANY, memdev_init, NULL)
 extern        char *ptvmmap;            /* poor name! */
 /*ARGSUSED*/
 int
-mmclose(dev, uio, flags)
+mmclose(dev, flags, fmt, p)
 	dev_t dev;
-	struct uio *uio;
 	int flags;
+	int fmt;
+	struct proc *p;
 {
 	struct trapframe *fp;
 
@@ -104,10 +105,11 @@ mmclose(dev, uio, flags)
 }
 /*ARGSUSED*/
 int
-mmopen(dev, uio, flags)
+mmopen(dev, flags, fmt, p)
 	dev_t dev;
-	struct uio *uio;
 	int flags;
+	int fmt;
+	struct proc *p;
 {
 	struct trapframe *fp;
 
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 1124471..3cec50d 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.5 1995/04/12 20:47:40 wollman Exp $
+ *	$Id: ctx.c,v 1.6 1995/05/30 08:01:27 rgrimes Exp $
  */
 
 /*
@@ -206,7 +206,7 @@ ctxattach(struct isa_device * devp)
 }
 
 int
-ctxopen(dev_t dev, int flag)
+ctxopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct ctx_soft_registers *sr;
 	u_char  unit;
@@ -262,7 +262,7 @@ ctxopen(dev_t dev, int flag)
 }
 
 int
-ctxclose(dev_t dev, int flag)
+ctxclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int     unit;
 
@@ -275,7 +275,7 @@ ctxclose(dev_t dev, int flag)
 }
 
 int
-ctxwrite(dev_t dev, struct uio * uio)
+ctxwrite(dev_t dev, struct uio * uio, int ioflag)
 {
 	int     unit, status = 0;
 	int     page, count, offset;
@@ -320,7 +320,7 @@ ctxwrite(dev_t dev, struct uio * uio)
 }
 
 int
-ctxread(dev_t dev, struct uio * uio)
+ctxread(dev_t dev, struct uio * uio, int ioflag)
 {
 	int     unit, status = 0;
 	int     page, count, offset;
@@ -363,7 +363,7 @@ ctxread(dev_t dev, struct uio * uio)
 }
 
 int
-ctxioctl(dev_t dev, int cmd, caddr_t data, int flag)
+ctxioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
 	int     error;
 	int     unit, i;
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index d07fa85..82e86c8 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -138,9 +138,11 @@ gpattach(isdp)
  * i.e. even if gpib5 is open, we can't open another minor device
  */
 int
-gpopen(dev, flag)
+gpopen(dev, flags, fmt, p)
 	dev_t dev;
-	int flag;
+	int flags;
+	int fmt;
+	struct proc *p;
 {
 	struct gpib_softc *sc = &gpib_sc;
 	int delay;	/* slept time in 1/hz seconds of tsleep */
@@ -217,10 +219,11 @@ enableremote(unit);
  *	Close gpib device.
  */
 int
-gpclose(dev, flag)
+gpclose(dev, flags, fmt, p)
 	dev_t dev;
-	int flag;
-
+	int flags;
+	int fmt;
+	struct proc *p;
 {
 	struct gpib_softc *sc = &gpib_sc;
         unsigned char unit;
@@ -319,9 +322,10 @@ while (!(inb(ISR1)&2)&&(status==EWOULDBLOCK));
  *    by minor(dev).
  */
 int
-gpwrite(dev, uio)
+gpwrite(dev, uio, ioflag)
 	dev_t dev;
 	struct uio *uio;
+	int ioflag;
 {
 	int err,count;
 
@@ -371,8 +375,9 @@ gpwrite(dev, uio)
    write to using a minor device = its GPIB address */
 
 int
-gpioctl(dev_t dev, int cmd, struct gpibdata *gd)
+gpioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
+	struct gpibdata *gd = (struct gpibdata *)data;
 	int	error,result;
 	error = 0;
 
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index b246ae2..2250688 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -511,7 +511,7 @@ gscattach(struct isa_device *isdp)
  * don't switch scanner on, wait until first read ioctls go before
  */
 
-int gscopen  (dev_t dev, int flag)
+int gscopen  (dev_t dev, int flags, int fmt, struct proc *p)
 {
   int unit = UNIT(minor(dev)) & UNIT_MASK;
   struct gsc_unit *scu = unittab + unit;
@@ -564,7 +564,7 @@ int gscopen  (dev_t dev, int flag)
  * release the buffer
  */
 
-int gscclose (dev_t dev, int flag)
+int gscclose (dev_t dev, int flags, int fmt, struct proc *p)
 {
   int unit = UNIT(minor(dev));
   struct gsc_unit *scu = unittab + unit;
@@ -597,7 +597,7 @@ int gscclose (dev_t dev, int flag)
  * gscread
  */
 
-int gscread  (dev_t dev, struct uio *uio)
+int gscread  (dev_t dev, struct uio *uio, int ioflag)
 {
   int unit = UNIT(minor(dev));
   struct gsc_unit *scu = unittab + unit;
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 23dcffc..441bfba 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.32 1995/06/22 07:03:20 davidg Exp $
+ *	$Id: lpt.c,v 1.33 1995/07/16 10:12:04 bde Exp $
  */
 
 /*
@@ -442,7 +442,7 @@ lptattach(struct isa_device *isdp)
  */
 
 int
-lptopen (dev_t dev, int flag)
+lptopen (dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct lpt_softc *sc;
 	int s;
@@ -576,7 +576,7 @@ lptout (struct lpt_softc * sc)
  */
 
 int
-lptclose(dev_t dev, int flag)
+lptclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct lpt_softc *sc = lpt_sc + LPTUNIT(minor(dev));
 	int port = sc->sc_port;
@@ -675,7 +675,7 @@ pushbytes(struct lpt_softc * sc)
  */
 
 int
-lptwrite(dev_t dev, struct uio * uio)
+lptwrite(dev_t dev, struct uio * uio, int ioflag)
 {
 	register unsigned n;
 	int pl, err;
@@ -773,7 +773,7 @@ lptintr(int unit)
 }
 
 int
-lptioctl(dev_t dev, int cmd, caddr_t data, int flag)
+lptioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
 	int	error = 0;
         struct	lpt_softc *sc;
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 1b18b4d..665462e 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -477,10 +477,10 @@ static struct kern_devconf kdc_matcd[TOTALDRIVES] = { {	/*<12>*/
 	Entry points and other connections to/from kernel - see conf.c
 ---------------------------------------------------------------------------*/
 
-	int	matcdopen(dev_t dev);
-	int	matcdclose(dev_t dev);
+	int	matcdopen(dev_t dev, int flags, int fmt, struct proc *p);
+	int	matcdclose(dev_t dev, int flags, int fmt, struct proc *p);
 	void	matcdstrategy(struct buf *bp);
-	int	matcdioctl(dev_t dev, int command, caddr_t addr, int flags);
+	int	matcdioctl(dev_t dev, int command, caddr_t addr, int flags, struct proc *p);
 	int	matcdsize(dev_t dev);
 extern	int	hz;
 extern	int	matcd_probe(struct isa_device *dev);
@@ -558,7 +558,7 @@ static	int	docmd(char * cmd, int ldrive, int cdrive,	/*<14>*/
 <15>	If LOCKDRIVE is enabled, additional minor number devices allow
 <15>	the drive to be locked while being accessed.
 ---------------------------------------------------------------------------*/
-int	matcdopen(dev_t dev)
+int	matcdopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int cdrive,ldrive,partition,controller;
 	struct matcd_data *cd;
@@ -751,7 +751,7 @@ int	matcdopen(dev_t dev)
 <15>	the drive.
 ---------------------------------------------------------------------------*/
 
-int matcdclose(dev_t dev)
+int matcdclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int	ldrive,cdrive,port,partition,controller;
 	struct matcd_data *cd;
@@ -960,7 +960,7 @@ static void matcd_start(struct buf *dp)
 	things that don't fit into the block read scheme of things.
 ---------------------------------------------------------------------------*/
 
-int matcdioctl(dev_t dev, int command, caddr_t addr, int flags)
+int matcdioctl(dev_t dev, int command, caddr_t addr, int flags, struct proc *p)
 {
 	struct	matcd_data *cd;
 	int	ldrive,cdrive,partition;
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 233ef93..fa3435e 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.44 1995/05/30 08:02:44 rgrimes Exp $
+ *	$Id: mcd.c,v 1.45 1995/08/15 19:56:59 joerg Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -164,10 +164,10 @@ struct mcd_data {
 #define MCD_S_WAITREAD	4
 
 /* prototypes */
-int	mcdopen(dev_t dev);
-int	mcdclose(dev_t dev);
+int	mcdopen(dev_t dev, int flags, int fmt, struct proc *p);
+int	mcdclose(dev_t dev, int flags, int fmt, struct proc *p);
 void	mcdstrategy(struct buf *bp);
-int	mcdioctl(dev_t dev, int cmd, caddr_t addr, int flags);
+int	mcdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p);
 int	mcdsize(dev_t dev);
 static	void	mcd_done(struct mcd_mbx *mbx);
 static	void	mcd_start(int unit);
@@ -265,7 +265,7 @@ int mcd_attach(struct isa_device *dev)
 	return 1;
 }
 
-int mcdopen(dev_t dev)
+int mcdopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int unit,part,phys,r,retry;
 	struct mcd_data *cd;
@@ -341,7 +341,7 @@ MCD_TRACE("open: partition=%d, disksize = %ld, blksize=%d\n",
 	return ENXIO;
 }
 
-int mcdclose(dev_t dev)
+int mcdclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int unit,part,phys;
 	struct mcd_data *cd;
@@ -491,7 +491,7 @@ static void mcd_start(int unit)
 	return;
 }
 
-int mcdioctl(dev_t dev, int cmd, caddr_t addr, int flags)
+int mcdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
 {
 	struct mcd_data *cd;
 	int unit,part;
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 7a1cf9c..f4a81f7 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.12 1995/05/30 08:02:47 rgrimes Exp $
+ * $Id: mse.c,v 1.13 1995/07/16 10:12:06 bde Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -241,9 +241,11 @@ mseattach(idp)
  * Exclusive open the mouse, initialize it and enable interrupts.
  */
 int
-mseopen(dev, flag)
+mseopen(dev, flags, fmt, p)
 	dev_t dev;
-	int flag;
+	int flags;
+	int fmt;
+	struct proc *p;
 {
 	register struct mse_softc *sc;
 	int s;
@@ -272,9 +274,11 @@ mseopen(dev, flag)
  * mseclose: just turn off mouse innterrupts.
  */
 int
-mseclose(dev, flag)
+mseclose(dev, flags, fmt, p)
 	dev_t dev;
-	int flag;
+	int flags;
+	int fmt;
+	struct proc *p;
 {
 	struct mse_softc *sc = &mse_sc[MSE_UNIT(dev)];
 	int s;
@@ -293,9 +297,10 @@ mseclose(dev, flag)
  * (Yes this is cheesy, but it makes the X386 server happy, so...)
  */
 int
-mseread(dev, uio)
+mseread(dev, uio, ioflag)
 	dev_t dev;
 	struct uio *uio;
+	int ioflag;
 {
 	register struct mse_softc *sc = &mse_sc[MSE_UNIT(dev)];
 	int xfer, s, error;
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index a3e93b1..232294b 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.13 1995/05/30 08:02:55 rgrimes Exp $
+ *	$Id: pcaudio.c,v 1.14 1995/09/03 05:43:30 julian Exp $
  */
 
 #include "pca.h"
@@ -81,8 +81,8 @@ static int pca_initialized = 0;
 void pcaintr(struct clockframe *frame);
 int pcaprobe(struct isa_device *dvp);
 int pcaattach(struct isa_device *dvp);
-int pcaclose(dev_t dev, int flag);
-int pcaopen(dev_t dev, int flag);
+int pcaclose(dev_t dev, int flags, int fmt, struct proc *p);
+int pcaopen(dev_t dev, int flags, int fmt, struct proc *p);
 int pcawrite(dev_t dev, struct uio *uio, int flag);
 int pcaioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p);
 int pcaselect(dev_t dev, int rw, struct proc *p);
@@ -272,7 +272,7 @@ pcaattach(struct isa_device *dvp)
 
 
 int
-pcaopen(dev_t dev, int flag)
+pcaopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	/* audioctl device can always be opened */
 	if (minor(dev) == 128)
@@ -300,7 +300,7 @@ pcaopen(dev_t dev, int flag)
 
 
 int
-pcaclose(dev_t dev, int flag)
+pcaclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	/* audioctl device can always be closed */
 	if (minor(dev) == 128)
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 9f50105..6a8ee5d 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.4 1995/05/09 12:25:58 rgrimes Exp $ */
+/* $Id: scd.c,v 1.5 1995/05/30 08:03:02 rgrimes Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -142,10 +142,10 @@ struct scd_data {
 } scd_data[NSCD];
 
 /* prototypes */
-int	scdopen(dev_t dev);
-int	scdclose(dev_t dev);
+int	scdopen(dev_t dev, int flags, int fmt, struct proc *p);
+int	scdclose(dev_t dev, int flags, int fmt, struct proc *p);
 void	scdstrategy(struct buf *bp);
-int	scdioctl(dev_t dev, int cmd, caddr_t addr, int flags);
+int	scdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p);
 int	scdsize(dev_t dev);
 
 static	int	bcd2bin(bcd_t b);
@@ -230,7 +230,7 @@ int scd_attach(struct isa_device *dev)
 }
 
 int
-scdopen(dev_t dev)
+scdopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int unit,part,phys;
 	int rc;
@@ -283,7 +283,7 @@ scdopen(dev_t dev)
 }
 
 int
-scdclose(dev_t dev)
+scdclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int unit,part,phys;
 	struct scd_data *cd;
@@ -419,7 +419,7 @@ scd_start(int unit)
 }
 
 int
-scdioctl(dev_t dev, int cmd, caddr_t addr, int flags)
+scdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
 {
 	struct scd_data *cd;
 	int unit,part;
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index d453e10..2c53e46 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -156,7 +156,7 @@ struct	spigot_softc	*ss=(struct spigot_softc *)&spigot_softc[devp->id_unit];
 }
 
 int
-spigot_open(dev_t dev, int flag)
+spigot_open(dev_t dev, int flags, int fmt, struct proc *p)
 {
 struct	spigot_softc	*ss = (struct spigot_softc *)&spigot_softc[UNIT(dev)];
 
@@ -174,7 +174,7 @@ struct	spigot_softc	*ss = (struct spigot_softc *)&spigot_softc[UNIT(dev)];
 }
 
 int
-spigot_close(dev_t dev, int flag)
+spigot_close(dev_t dev, int flags, int fmt, struct proc *p)
 {
 struct	spigot_softc	*ss = (struct spigot_softc *)&spigot_softc[UNIT(dev)];
 
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 9a98251..764d552 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.14 1995/05/30 08:03:09 rgrimes Exp $
+ *    $Id: spkr.c,v 1.15 1995/09/03 05:43:31 julian Exp $
  */
 
 #include "speaker.h"
@@ -451,8 +451,11 @@ size_t	slen;
 static int spkr_active = FALSE; /* exclusion flag */
 static struct buf *spkr_inbuf;  /* incoming buf */
 
-int spkropen(dev)
-dev_t	dev;
+int spkropen(dev, flags, fmt, p)
+dev_t		dev;
+int		flags;
+int		fmt;
+struct proc	*p;
 {
 #ifdef DEBUG
     (void) printf("spkropen: entering with dev = %x\n", dev);
@@ -474,9 +477,10 @@ dev_t	dev;
     }
 }
 
-int spkrwrite(dev, uio)
+int spkrwrite(dev, uio, ioflag)
 dev_t		dev;
 struct uio	*uio;
+int		ioflag;
 {
 #ifdef DEBUG
     printf("spkrwrite: entering with dev = %x, count = %d\n",
@@ -501,8 +505,11 @@ struct uio	*uio;
     }
 }
 
-int spkrclose(dev)
-dev_t	dev;
+int spkrclose(dev, flags, fmt, p)
+dev_t		dev;
+int		flags;
+int		fmt;
+struct proc	*p;
 {
 #ifdef DEBUG
     (void) printf("spkrclose: entering with dev = %x\n", dev);
@@ -520,10 +527,12 @@ dev_t	dev;
     }
 }
 
-int spkrioctl(dev, cmd, cmdarg)
-dev_t	dev;
-int	cmd;
-caddr_t	cmdarg;
+int spkrioctl(dev, cmd, cmdarg, flags, p)
+dev_t		dev;
+int		cmd;
+caddr_t		cmdarg;
+int		flags;
+struct proc	*p;
 {
 #ifdef DEBUG
     (void) printf("spkrioctl: entering with dev = %x, cmd = %x\n");
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 49e451c..91f5350 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -383,9 +383,10 @@ int twclose(dev, flag, mode, p)
   return(0);
 }
 
-int twread(dev, uio)
+int twread(dev, uio, ioflag)
      dev_t dev;
      struct uio *uio;
+     int ioflag;
 {
   u_char buf[3];
   struct tw_sc *sc = &tw_sc[TWUNIT(dev)];
@@ -400,9 +401,10 @@ int twread(dev, uio)
   return(error);
 }
 
-int twwrite(dev, uio)
+int twwrite(dev, uio, ioflag)
      dev_t dev;
      struct uio *uio;
+     int ioflag;
 {
   struct tw_sc *sc;
   int house, key, reps;
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 04c7416..e02c140 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.17 1995/05/30 08:03:22 rgrimes Exp $
+ * $Id: wt.c,v 1.18 1995/09/05 05:45:34 julian Exp $
  *
  */
 
@@ -264,13 +264,13 @@ int wtattach (struct isa_device *id)
 
 struct isa_driver wtdriver = { wtprobe, wtattach, "wt", };
 
-int wtdump (int dev)
+int wtdump (dev_t dev)
 {
 	/* Not implemented */
 	return (EINVAL);
 }
 
-int wtsize (int dev)
+int wtsize (dev_t dev)
 {
 	/* Not implemented */
 	return (-1);
@@ -279,7 +279,7 @@ int wtsize (int dev)
 /*
  * Open routine, called on every device open.
  */
-int wtopen (int dev, int flag)
+int wtopen (dev_t dev, int flag, int fmt, struct proc *p)
 {
 	int u = minor (dev) & T_UNIT;
 	wtinfo_t *t = wttab + u;
@@ -357,7 +357,7 @@ int wtopen (int dev, int flag)
 /*
  * Close routine, called on last device close.
  */
-int wtclose (int dev)
+int wtclose (dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int u = minor (dev) & T_UNIT;
 	wtinfo_t *t = wttab + u;
@@ -407,7 +407,7 @@ done:
  * ioctl (int fd, MTIOCTOP, struct mtop *buf)   -- do BSD-like op
  * ioctl (int fd, WTQICMD, int qicop)           -- do QIC op
  */
-int wtioctl (int dev, int cmd, void *arg, int mode)
+int wtioctl (dev_t dev, int cmd, caddr_t arg, int flags, struct proc *p)
 {
 	int u = minor (dev) & T_UNIT;
 	wtinfo_t *t = wttab + u;