From 336a6f070b228b59f25b26ea4de3ac0ff1c7160f Mon Sep 17 00:00:00 2001 From: bde Date: Sat, 4 Nov 1995 13:25:33 +0000 Subject: Moved prototypes for devswitch functions from conf.c and driver sources to . 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. --- sys/i386/isa/cy.c | 12 +----------- sys/i386/isa/fd.c | 6 +----- sys/i386/isa/matcd/matcd.c | 11 +---------- sys/i386/isa/mcd.c | 7 +------ sys/i386/isa/pcaudio.c | 7 +------ sys/i386/isa/rc.c | 12 ++++++------ sys/i386/isa/scd.c | 8 +------- sys/i386/isa/si.c | 3 +-- sys/i386/isa/sio.c | 12 +----------- sys/i386/isa/sound/soundcard.c | 8 +------- sys/i386/isa/wdreg.h | 8 +------- 11 files changed, 16 insertions(+), 78 deletions(-) (limited to 'sys/i386/isa') diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 0ac16d6..786ae30 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/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/i386/isa/fd.c b/sys/i386/isa/fd.c index bca87e1..150e692 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.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/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index ff24f71..830cf5b 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -523,18 +523,9 @@ static struct kern_devconf kdc_matcd[TOTALDRIVES] = { { /*<12>*/ /*--------------------------------------------------------------------------- - Entry points and other connections to/from kernel - see conf.c + Entry points and other connections to/from kernel - see also conf.h ---------------------------------------------------------------------------*/ - int matcdopen(dev_t dev, int flags, /*<22>*/ - int fmt, struct proc *p); /*<22>*/ - int matcdclose(dev_t dev, int flags, /*<22>*/ - int fmt, struct proc *p); /*<22>*/ - void matcdstrategy(struct buf *bp); - int matcdioctl(dev_t dev, int command, /*<22>*/ - caddr_t addr, int flags, /*<22>*/ - struct proc *p); /*<22>*/ - int matcdsize(dev_t dev); extern int hz; extern int matcd_probe(struct isa_device *dev); extern int matcd_attach(struct isa_device *dev); diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index d22984d..2b6b036 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.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/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 232294b..58f26bb 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.14 1995/09/03 05:43:30 julian Exp $ + * $Id: pcaudio.c,v 1.15 1995/09/08 11:07:53 bde Exp $ */ #include "pca.h" @@ -81,11 +81,6 @@ 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 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); struct isa_driver pcadriver = { pcaprobe, pcaattach, "pca", diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 370a59e..03507e4 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/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/i386/isa/scd.c b/sys/i386/isa/scd.c index 831d53e..c7bbe07 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/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/i386/isa/si.c b/sys/i386/isa/si.c index 0c1c69e..06bd455 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/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/i386/isa/sio.c b/sys/i386/isa/sio.c index 0f6b33f..18d7a45 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/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/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index 9f1a196..381ea31 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: soundcard.c,v 1.28 1995/09/01 19:09:11 jkh Exp $ + * $Id: soundcard.c,v 1.29 1995/09/08 19:57:13 bde Exp $ */ #include "sound_config.h" @@ -59,12 +59,6 @@ struct selinfo selinfo[SND_NDEVS >> 4]; int sndprobe (struct isa_device *dev); int sndattach (struct isa_device *dev); -int sndopen (dev_t dev, int flags, int fmt, struct proc *p); -int sndclose (dev_t dev, int flags, int fmt, struct proc *p); -int sndioctl (dev_t dev, int cmd, caddr_t arg, int flags, struct proc *p); -int sndread (dev_t dev, struct uio *uio, int ioflag); -int sndwrite (dev_t dev, struct uio *uio, int ioflag); -int sndselect (dev_t dev, int rw, struct proc *p); static void sound_mem_init(void); struct isa_driver opldriver = {sndprobe, sndattach, "opl"}; diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h index 1674923..5590725 100644 --- a/sys/i386/isa/wdreg.h +++ b/sys/i386/isa/wdreg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: wdreg.h,v 1.7 1995/02/26 01:15:29 bde Exp $ + * $Id: wdreg.h,v 1.8 1995/03/22 05:23:01 davidg Exp $ */ /* @@ -138,15 +138,9 @@ struct wdparams { /* * wd driver entry points */ -void wdstrategy(struct buf *bp); void wdintr(int unit); -int wdopen(dev_t dev, int flags, int fmt, struct proc *p); -int wdclose(dev_t dev, int flags, int fmt, struct proc *p); -int wdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p); #ifdef B_FORMAT int wdformat(struct buf *bp); #endif -int wdsize(dev_t dev); -int wddump(dev_t dev); #endif /* KERNEL */ -- cgit v1.1