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

functions were wrong.

5 files changed, 47 insertions, 35 deletions

diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index 03f8b58..e329112 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.5 1995/05/11 19:25:55 rgrimes Exp $";
+static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.6 1995/05/30 07:57:57 rgrimes Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.5 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.6 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,9 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.5 1995/05/11 19:25:55 rgrim
  *
  *******************************************************************************
  * $Log: nic3008.c,v $
+ * Revision 1.6  1995/05/30  07:57:57  rgrimes
+ * Remove trailing whitespace.
+ *
  * Revision 1.5  1995/05/11  19:25:55  rgrimes
  * Fix -Wformat warnings from LINT kernel.
  *
@@ -548,7 +551,7 @@ reset_card(struct nic_softc * sc)
  * We forbid all but first open
  */
 int
-nicopen(dev_t dev, int flag)
+nicopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct nic_softc *sc;
 	u_char          unit;
@@ -579,7 +582,7 @@ nicopen(dev_t dev, int flag)
  * nicclose() Close device
  */
 int
-nicclose(dev_t dev, int flag)
+nicclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct nic_softc *sc = &nic_sc[minor(dev)];
 
@@ -588,7 +591,7 @@ nicclose(dev_t dev, int flag)
 }
 
 int
-nicioctl(dev_t dev, int cmd, caddr_t data, int flag)
+nicioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
 	int             error;
 	u_char          unit;
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index 1816ee5..a8cdee7 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.5 1995/03/28 07:54:33 bde Exp $";
+static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.6 1995/05/11 19:25:56 rgrimes Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.5 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.6 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,9 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.5 1995/03/28 07:54:33 bde E
  *
  *******************************************************************************
  * $Log: nic3009.c,v $
+ * Revision 1.6  1995/05/11  19:25:56  rgrimes
+ * Fix -Wformat warnings from LINT kernel.
+ *
  * Revision 1.5  1995/03/28  07:54:33  bde
  * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
  * (except in netccitt, netiso and netns) that I didn't notice when I fixed
@@ -498,7 +501,7 @@ nnic_accept(int cn, int an, int rea)
 }
 
 int
-nnicopen(dev_t dev, int flag)
+nnicopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct nnic_softc *sc;
 	u_char          unit;
@@ -528,7 +531,7 @@ nnicopen(dev_t dev, int flag)
 }
 
 int
-nnicclose(dev_t dev, int flag)
+nnicclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct nnic_softc *sc = &nnic_sc[minor(dev)];
 
@@ -537,7 +540,7 @@ nnicclose(dev_t dev, int flag)
 }
 
 int
-nnicioctl(dev_t dev, int cmd, caddr_t data, int flag)
+nnicioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *pr)
 {
 	int             error;
 	int             i, x;
diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c
index 7d17076..6acaf61 100644
--- a/sys/gnu/isdn/iispy.c
+++ b/sys/gnu/isdn/iispy.c
@@ -1,6 +1,6 @@
-static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.2 1995/02/15 06:28:27 jkh Exp $";
+static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.3 1995/03/28 07:54:40 bde Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.2 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.3 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,11 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.2 1995/02/15 06:28:27 jkh Exp
  *
  *******************************************************************************
  * $Log: iispy.c,v $
+ * Revision 1.3  1995/03/28  07:54:40  bde
+ * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
+ * (except in netccitt, netiso and netns) that I didn't notice when I fixed
+ * "all" such warnings before.
+ *
  * Revision 1.2  1995/02/15  06:28:27  jkh
  * Fix up include paths, nuke some warnings.
  *
@@ -104,7 +109,7 @@ ispy_input(int no, int len, char *buf, int out)
 }
 
 int
-ispyopen(dev_t dev, int flag)
+ispyopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int             err;
 	struct ispy_data *ispy;
@@ -121,7 +126,7 @@ ispyopen(dev_t dev, int flag)
 }
 
 int
-ispyclose(dev_t dev, int flag)
+ispyclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct ispy_data *ispy= &ispy_data[minor(dev)];
 
@@ -132,10 +137,7 @@ ispyclose(dev_t dev, int flag)
 }
 
 int
-ispyioctl (dev, cmd, data, flag)
-dev_t           dev;
-caddr_t         data;
-int cmd, flag;
+ispyioctl (dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
         int     unit = minor(dev);
 
@@ -147,7 +149,7 @@ int cmd, flag;
 }
 
 int
-ispyread(dev_t dev, struct uio * uio)
+ispyread(dev_t dev, struct uio * uio, int ioflag)
 {
 	int             x;
 	int             error = 0;
diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c
index 947e1d5..c09644a 100644
--- a/sys/gnu/isdn/iitel.c
+++ b/sys/gnu/isdn/iitel.c
@@ -1,6 +1,6 @@
-static char     _itelid[] = "@(#)$Id: iitel.c,v 1.3 1995/03/28 07:54:41 bde Exp $";
+static char     _itelid[] = "@(#)$Id: iitel.c,v 1.4 1995/07/16 10:11:10 bde Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.3 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.4 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,10 @@ static char     _itelid[] = "@(#)$Id: iitel.c,v 1.3 1995/03/28 07:54:41 bde Exp
  *
  *******************************************************************************
  * $Log: iitel.c,v $
+ * Revision 1.4  1995/07/16  10:11:10  bde
+ * Don't include <sys/tty.h> in drivers that aren't tty drivers or in general
+ * files that don't depend on the internals of <sys/tty.h>
+ *
  * Revision 1.3  1995/03/28  07:54:41  bde
  * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
  * (except in netccitt, netiso and netns) that I didn't notice when I fixed
@@ -139,7 +143,7 @@ itel_disconnect(int no)
 }
 
 int
-itelopen(dev_t dev, int flag)
+itelopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int             err;
 	struct itel_data *itel;
@@ -159,7 +163,7 @@ itelopen(dev_t dev, int flag)
 }
 
 int
-itelclose(dev_t dev, int flag)
+itelclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	struct itel_data *itel= &itel_data[minor(dev)];
 
@@ -172,10 +176,7 @@ itelclose(dev_t dev, int flag)
 }
 
 int
-itelioctl (dev, cmd, data, flag)
-dev_t           dev;
-caddr_t         data;
-int cmd, flag;
+itelioctl (dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
         int     unit = minor(dev);
 
@@ -187,7 +188,7 @@ int cmd, flag;
 }
 
 int
-itelread(dev_t dev, struct uio * uio)
+itelread(dev_t dev, struct uio * uio, int ioflag)
 {
 	int             x;
 	int             error = 0;
@@ -213,7 +214,7 @@ itelread(dev_t dev, struct uio * uio)
 }
 
 int
-itelwrite(dev_t dev, struct uio * uio)
+itelwrite(dev_t dev, struct uio * uio, int ioflag)
 {
 	int             x;
 	int             error = 0;
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index e1e4fd1..edb87f7 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,6 +1,6 @@
-static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.3 1995/03/28 07:54:44 bde Exp $";
+static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.4 1995/05/30 07:58:02 rgrimes Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.3 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.4 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,9 @@ static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.3 1995/03/28 07:54:44 bde Exp $
  *
  *******************************************************************************
  * $Log: isdn.c,v $
+ * Revision 1.4  1995/05/30  07:58:02  rgrimes
+ * Remove trailing whitespace.
+ *
  * Revision 1.3  1995/03/28  07:54:44  bde
  * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
  * (except in netccitt, netiso and netns) that I didn't notice when I fixed
@@ -197,7 +200,7 @@ isdn_ctrl_attach(int n)
  *  isdn device are the ISDN-daemon
  */
 int
-isdnopen(dev_t dev, int flag)
+isdnopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int             err;
 
@@ -214,14 +217,14 @@ isdnopen(dev_t dev, int flag)
 }
 
 int
-isdnclose(dev_t dev, int flag)
+isdnclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	o_flags &= ~(1 << minor(dev));
 	return (0);
 }
 
 int
-isdnread(dev_t dev, struct uio * uio)
+isdnread(dev_t dev, struct uio * uio, int ioflag)
 {
 	int             x;
 	int             error = 0;
@@ -246,7 +249,7 @@ isdnread(dev_t dev, struct uio * uio)
 }
 
 int
-isdnioctl(dev_t dev, int cmd, caddr_t data, int flag)
+isdnioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
 	int             err, x, i;
 	isdn_appl_t    *appl;