6 files changed, 55 insertions, 38 deletions

diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 233ef9394ad9..fa3435e2a7d7 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/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/dev/mse/mse.c b/sys/dev/mse/mse.c
index 7a1cf9cdd314..f4a81f7ce5b7 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/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/dev/scd/scd.c b/sys/dev/scd/scd.c
index 9f50105f57f6..6a8ee5d55df5 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/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/dev/snp/snp.c b/sys/dev/snp/snp.c
index 503836b79a65..abfc765b4cdf 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -339,9 +339,11 @@ detach_notty:
 }
 
 int
-snpclose(dev, flag)
+snpclose(dev, flags, fmt, p)
 	dev_t           dev;
-	int             flag;
+	int             flags;
+	int             fmt;
+	struct proc    *p;
 {
 	register int    unit = minor(dev);
 	struct snoop   *snp = &snoopsw[unit];
@@ -367,11 +369,12 @@ snpdown(snp)
 
 
 int
-snpioctl(dev, cmd, data, flag)
+snpioctl(dev, cmd, data, flags, p)
 	dev_t           dev;
 	int             cmd;
 	caddr_t         data;
-	int             flag;
+	int             flags;
+	struct proc    *p;
 {
 	int             unit = minor(dev), s;
 	dev_t		tdev;
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 9a98251368a3..764d5524d153 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/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/dev/vn/vn.c b/sys/dev/vn/vn.c
index a1526cdf0860..2e0e03ac5aa3 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -129,12 +129,12 @@ u_long	vn_options;
 int	vnclose __P((dev_t dev, int flags, int mode, struct proc *p));
 int	vnopen __P((dev_t dev, int flags, int mode, struct proc *p));
 void	vnstrategy __P((struct buf *bp));
-int	vnioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
+int	vnioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p));
 void	vniodone __P((struct buf *bp));
 int	vnsetcred __P((struct vn_softc *vn, struct ucred *cred));
 void	vnshutdown __P((void));
 void	vnclear __P((struct vn_softc *vn));
-size_t	vnsize __P((dev_t dev));
+int	vnsize __P((dev_t dev));
 int	vndump __P((dev_t dev));
 
 int
@@ -377,7 +377,7 @@ vniodone( struct buf *bp) {
 
 /* ARGSUSED */
 int
-vnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+vnioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct vn_softc *vn = vn_softc[vnunit(dev)];
 	struct vn_ioctl *vio;
@@ -577,7 +577,7 @@ vnclear(struct vn_softc *vn)
 			dsgone(&vn->sc_slices);
 }
 
-size_t
+int
 vnsize(dev_t dev)
 {
 	int unit = vnunit(dev);