Get prototypes from *dev_decl() macros rather than running our own.

3 files changed, 16 insertions, 41 deletions

diff --git a/sys/arch/hp300/dev/ac.c b/sys/arch/hp300/dev/ac.c
index dc5ccbd89fa..c2d25f066e6 100644
--- a/sys/arch/hp300/dev/ac.c
+++ b/sys/arch/hp300/dev/ac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ac.c,v 1.11 2002/11/29 20:15:43 deraadt Exp $	*/
+/*	$OpenBSD: ac.c,v 1.12 2002/12/25 20:40:36 miod Exp $	*/
 /*	$NetBSD: ac.c,v 1.9 1997/04/02 22:37:21 scottr Exp $	*/
 
 /*
@@ -62,16 +62,15 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
+#include <sys/conf.h>
+
 #include <hp300/dev/scsireg.h>
 #include <hp300/dev/scsivar.h>
 #include <hp300/dev/acioctl.h>
 #include <hp300/dev/acvar.h>
 
-/* cdev_decl(ac); */
-/* XXX we should use macros to do these... */
-int	acopen(dev_t, int, int, struct proc *);
-int	acclose(dev_t, int, int, struct proc *);
-int	acioctl(dev_t, u_long, caddr_t, int, struct proc *);
+bdev_decl(ac);
+cdev_decl(ac);
 
 static int	acmatch(struct device *, void *, void *);
 static void	acattach(struct device *, struct device *, void *);
diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c
index 9559703022d..5029530c2ab 100644
--- a/sys/arch/hp300/dev/sd.c
+++ b/sys/arch/hp300/dev/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.26 2002/06/09 05:23:26 miod Exp $	*/
+/*	$OpenBSD: sd.c,v 1.27 2002/12/25 20:40:36 miod Exp $	*/
 /*	$NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $	*/
 
 /*
@@ -58,6 +58,8 @@
 
 #include <ufs/ffs/fs.h>			/* for BBSIZE and SBSIZE */
 
+#include <sys/conf.h>
+
 #include <hp300/dev/scsireg.h>
 #include <hp300/dev/scsivar.h>
 #include <hp300/dev/sdvar.h>
@@ -66,13 +68,6 @@
 #include <hp300/hp300/leds.h>
 #endif
 
-/*
-extern void disksort();
-extern void biodone();
-extern int physio();
-extern void TBIS();
-*/
-
 int	sdmatch(struct device *, void *, void *);
 void	sdattach(struct device *, struct device *, void *);
 
@@ -119,20 +114,10 @@ static char legal_cmds[256] = {
 /*f0*/	0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
 };
 
-/* bdev_decl(sd); */
-/* cdev_decl(sd); */
-/* XXX we should use macros to do these... */
-int	sdopen(dev_t, int, int, struct proc *);
-int	sdclose(dev_t, int, int, struct proc *);
+bdev_decl(sd);
+cdev_decl(sd);
 
-int	sdioctl(dev_t, u_long, caddr_t, int, struct proc *);
-int	sdread(dev_t, struct uio *, int);
 void	sdreset(struct sd_softc *);
-int	sdwrite(dev_t, struct uio *, int);
-
-void	sdstrategy(struct buf *);
-int	sddump(dev_t, daddr_t, caddr_t, size_t);
-int	sdsize(dev_t);
 
 static void 	sdgetgeom(struct sd_softc *);
 static void	sdlblkstrat(struct buf *, int);
diff --git a/sys/arch/hp300/dev/st.c b/sys/arch/hp300/dev/st.c
index 8f02d741249..9e0d1b5a8b7 100644
--- a/sys/arch/hp300/dev/st.c
+++ b/sys/arch/hp300/dev/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.14 2002/06/09 05:23:26 miod Exp $	*/
+/*	$OpenBSD: st.c,v 1.15 2002/12/25 20:40:36 miod Exp $	*/
 /*	$NetBSD: st.c,v 1.22 1997/04/02 22:37:38 scottr Exp $	*/
 
 /*
@@ -88,6 +88,8 @@
 #include <sys/tprintf.h>
 #include <sys/device.h>
 
+#include <sys/conf.h>
+
 #include <hp300/dev/scsireg.h>
 #include <hp300/dev/scsivar.h>
 #include <hp300/dev/stvar.h>
@@ -162,18 +164,8 @@ int st_extti = 0x01;		/* bitmask of unit numbers, do extra */
 				/* sensing so TTi display gets updated */
 #endif
 
-/* bdev_decl(st); */
-/* cdev_decl(st); */
-/* XXX we should use macros to do these... */
-int	stopen(dev_t, int, int, struct proc *);
-int	stclose(dev_t, int, int, struct proc *);
-
-int	stioctl(dev_t, u_long, caddr_t, int, struct proc *);
-int	stread(dev_t, struct uio *, int);
-int	stwrite(dev_t, struct uio *, int);
-
-void	ststrategy(struct buf *);
-int	stdump(dev_t);
+bdev_decl(st);
+cdev_decl(st);
 
 #ifdef DEBUG
 void	dumpxsense(struct st_xsense *);
@@ -826,8 +818,7 @@ stwrite(dev, uio, flags)
 
 /*ARGSUSED*/
 int
-stdump(dev)
-	dev_t dev;
+stdump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
 {
 	return(ENXIO);
 }