Moved prototypes for devswitch functions from conf.c and driver sources

to <machine/conf.h>.  conf.h was mechanically generated by
`grep ^d_ conf.c >conf.h'.  This accounts for part of its ugliness.  The
prototypes should be moved back to the driver sources when the functions
are staticalized.

10 files changed, 14 insertions, 76 deletions

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 0ac16d6..786ae30 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,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: cy.c,v 1.15 1995/10/11 02:41:13 davidg Exp $
+ *	$Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
  */
 
 #include "cy.h"
@@ -330,17 +330,7 @@ void	siointrts	__P((int unit));
 void	siopoll		__P((void));
 
 /* Device switch entry points. */
-int	sioopen		__P((dev_t dev, int oflags, int devtype,
-			     struct proc *p));
-int	sioclose	__P((dev_t dev, int fflag, int devtype,
-			     struct proc *p));
-int	sioread		__P((dev_t dev, struct uio *uio, int ioflag));
-int	siowrite	__P((dev_t dev, struct uio *uio, int ioflag));
-int	sioioctl	__P((dev_t dev, int cmd, caddr_t data,
-			     int fflag, struct proc *p));
-void	siostop		__P((struct tty *tp, int rw));
 #define	sioreset	noreset
-struct tty *siodevtotty	__P((dev_t dev));
 #define	siommap		nommap
 #define	siostrategy	nostrategy
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 0ac16d6..786ae30 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,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: cy.c,v 1.15 1995/10/11 02:41:13 davidg Exp $
+ *	$Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
  */
 
 #include "cy.h"
@@ -330,17 +330,7 @@ void	siointrts	__P((int unit));
 void	siopoll		__P((void));
 
 /* Device switch entry points. */
-int	sioopen		__P((dev_t dev, int oflags, int devtype,
-			     struct proc *p));
-int	sioclose	__P((dev_t dev, int fflag, int devtype,
-			     struct proc *p));
-int	sioread		__P((dev_t dev, struct uio *uio, int ioflag));
-int	siowrite	__P((dev_t dev, struct uio *uio, int ioflag));
-int	sioioctl	__P((dev_t dev, int cmd, caddr_t data,
-			     int fflag, struct proc *p));
-void	siostop		__P((struct tty *tp, int rw));
 #define	sioreset	noreset
-struct tty *siodevtotty	__P((dev_t dev));
 #define	siommap		nommap
 #define	siostrategy	nostrategy
 
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 2c5e2fe..1e61971 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.3 1995/10/04 21:51:24 jkh Exp $
+ *  dgb.c $Id: dgb.c,v 1.4 1995/10/12 23:28:31 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -156,17 +156,7 @@ void	dgbintr		__P((int unit));
 void	dgbpoll		__P((void *unit_c));
 
 /* Device switch entry points. */
-int	dgbopen		__P((dev_t dev, int oflags, int devtype,
-			     struct proc *p));
-int	dgbclose	__P((dev_t dev, int fflag, int devtype,
-			     struct proc *p));
-int	dgbread		__P((dev_t dev, struct uio *uio, int ioflag));
-int	dgbwrite	__P((dev_t dev, struct uio *uio, int ioflag));
-int	dgbioctl	__P((dev_t dev, int cmd, caddr_t data,
-			     int fflag, struct proc *p));
-void	dgbstop		__P((struct tty *tp, int rw));
 #define	dgbreset	noreset
-struct tty *dgbdevtotty	__P((dev_t dev));
 #define	dgbmmap		nommap
 #define	dgbstrategy	nostrategy
 
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index bca87e1..150e692 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.66 1995/10/09 15:00:36 joerg Exp $
+ *	$Id: fd.c,v 1.67 1995/10/28 15:38:57 phk Exp $
  *
  */
 
@@ -275,10 +275,6 @@ static int fdattach(struct isa_device *);
 /* exported functions */
 int fdsize (dev_t);
 void fdintr(fdcu_t);
-int Fdopen(dev_t, int, int, struct proc *);
-int fdclose(dev_t, int, int, struct proc *);
-void fdstrategy(struct buf *);
-int fdioctl(dev_t, int, caddr_t, int, struct proc *);
 
 /* needed for ft driver, thus exported */
 int in_fdc(fdcu_t);
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index d22984d..2b6b036 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.46 1995/09/08 11:07:48 bde Exp $
+ *	$Id: mcd.c,v 1.47 1995/10/28 15:39:15 phk Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -164,11 +164,6 @@ struct mcd_data {
 #define MCD_S_WAITREAD	4
 
 /* prototypes */
-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, struct proc *p);
-int	mcdsize(dev_t dev);
 static	void	mcd_start(int unit);
 static	int	mcd_getdisklabel(int unit);
 #ifdef NOTYET
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 370a59e..03507e4 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -62,14 +62,14 @@
 int     rcprobe         __P((struct isa_device *));
 int     rcattach        __P((struct isa_device *));
 
-int     rcopen          __P((dev_t, int, int, struct proc *));
-int     rcclose         __P((dev_t, int, int, struct proc *));
-int     rcread          __P((dev_t, struct uio *, int));
-int     rcwrite         __P((dev_t, struct uio *, int));
+/*-
+ * This space intentionally left blank to stop __LINE__ from screwing up
+ * regression tests :-(.
+ *
+ *
+ */
 void    rcintr          __P((int));
 void    rcpoll          __P((void));
-void    rcstop          __P((struct tty *, int));
-int     rcioctl         __P((dev_t, int, caddr_t, int, struct proc *));
 
 #define rcin(port)      RC_IN  (nec, port)
 #define rcout(port,v)   RC_OUT (nec, port, v)
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 831d53e..c7bbe07 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.7 1995/09/19 18:55:15 bde Exp $ */
+/* $Id: scd.c,v 1.8 1995/10/28 15:39:17 phk Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -142,12 +142,6 @@ static struct scd_data {
 } scd_data[NSCD];
 
 /* prototypes */
-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, struct proc *p);
-int	scdsize(dev_t dev);
-
 static	int	bcd2bin(bcd_t b);
 static	bcd_t	bin2bcd(int b);
 static	void	hsg2msf(int hsg, bcd_t *msf);
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 0c1c69e..06bd455 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.10 1995/10/21 09:10:49 peter Exp $
+ *	$Id: si.c,v 1.11 1995/10/28 15:39:19 phk Exp $
  */
 
 #ifndef lint
@@ -94,7 +94,6 @@ static void si_disc_optim __P((struct tty *tp, struct termios *t,
 static void sihardclose __P((struct si_port *pp));
 static void sidtrwakeup __P((void *chan));
 
-void	sistop	__P((struct tty *tp, int rw));
 void	siintr	__P((int unit));
 int	siparam __P((struct tty *, struct termios *));
 
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 0f6b33f..18d7a45 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.114 1995/10/21 00:55:25 phk Exp $
+ *	$Id: sio.c,v 1.115 1995/10/22 15:38:05 bde Exp $
  */
 
 #include "sio.h"
@@ -256,17 +256,7 @@ void	siointrts	__P((int unit));
 void	siopoll		__P((void));
 
 /* Device switch entry points. */
-int	sioopen		__P((dev_t dev, int oflags, int devtype,
-			     struct proc *p));
-int	sioclose	__P((dev_t dev, int fflag, int devtype,
-			     struct proc *p));
-int	sioread		__P((dev_t dev, struct uio *uio, int ioflag));
-int	siowrite	__P((dev_t dev, struct uio *uio, int ioflag));
-int	sioioctl	__P((dev_t dev, int cmd, caddr_t data,
-			     int fflag, struct proc *p));
-void	siostop		__P((struct tty *tp, int rw));
 #define	sioreset	noreset
-struct tty *siodevtotty	__P((dev_t dev));
 #define	siommap		nommap
 #define	siostrategy	nostrategy
 
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 2e0e03a..fe6033e 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -126,16 +126,10 @@ u_long	vn_options;
 /*
  * XXX these decls should be static (without __P(())) or elsewhere.
  */
-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, 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));
-int	vnsize __P((dev_t dev));
-int	vndump __P((dev_t dev));
 
 int
 vnclose(dev_t dev, int flags, int mode, struct proc *p)