diff options
Diffstat (limited to 'sys')
35 files changed, 342 insertions, 530 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 0ac16d616e14..786ae30f13d4 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 0ac16d616e14..786ae30f13d4 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 2c5e2febb0ed..1e6197168848 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 bca87e11c569..150e6924fee0 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 d22984d3675d..2b6b03645e35 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 370a59e3cea1..03507e457bab 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 831d53e42684..c7bbe07771b5 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 0c1c69ebae30..06bd4555cef0 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 0f6b33f25685..18d7a452fe2d 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 2e0e03ac5aa3..fe6033e64283 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) diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index 2c5e2febb0ed..1e6197168848 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/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/i386/i386/conf.c b/sys/i386/i386/conf.c index f95ce6f5d062..088b08c5c781 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.102 1995/10/14 15:40:42 davidg Exp $ + * $Id: conf.c,v 1.103 1995/10/28 16:57:52 markm Exp $ */ #include <sys/param.h> @@ -54,7 +54,6 @@ #include <sys/tty.h> #include <sys/conf.h> -d_rdwr_t rawread, rawwrite; /* Lots of bogus defines for shorthand purposes */ #define noopen (d_open_t *)enodev @@ -99,12 +98,6 @@ int lkmenodev(); #include "wd.h" #if (NWD > 0) -d_open_t wdopen; -d_close_t wdclose; -d_strategy_t wdstrategy; -d_ioctl_t wdioctl; -d_dump_t wddump; -d_psize_t wdsize; #else #define wdopen nxopen #define wdclose nxclose @@ -116,12 +109,6 @@ d_psize_t wdsize; #include "worm.h" #if NWORM > 0 -d_open_t wormopen; -d_close_t wormclose; -d_strategy_t wormstrategy; -d_ioctl_t wormioctl; -d_dump_t wormdump; -d_psize_t wormsize; #else #define wormopen nxopen #define wormclose nxclose @@ -133,12 +120,6 @@ d_psize_t wormsize; #include "sctarg.h" #if NSCTARG > 0 -d_open_t sctargopen; -d_close_t sctargclose; -d_strategy_t sctargstrategy; -d_ioctl_t sctargioctl; -d_dump_t sctargdump; -d_psize_t sctargsize; #else #define sctargopen nxopen #define sctargclose nxclose @@ -150,12 +131,6 @@ d_psize_t sctargsize; #include "pt.h" #if NPT > 0 -d_open_t ptopen; -d_close_t ptclose; -d_strategy_t ptstrategy; -d_ioctl_t ptioctl; -d_dump_t ptdump; -d_psize_t ptsize; #else #define ptopen nxopen #define ptclose nxclose @@ -167,12 +142,6 @@ d_psize_t ptsize; #include "sd.h" #if NSD > 0 -d_open_t sdopen; -d_close_t sdclose; -d_strategy_t sdstrategy; -d_ioctl_t sdioctl; -d_dump_t sddump; -d_psize_t sdsize; #else #define sdopen nxopen #define sdclose nxclose @@ -184,10 +153,6 @@ d_psize_t sdsize; #include "st.h" #if NST > 0 -d_open_t stopen; -d_close_t stclose; -d_strategy_t ststrategy; -d_ioctl_t stioctl; /*int stdump(),stsize();*/ #define stdump nxdump #define stsize zerosize @@ -202,11 +167,6 @@ d_ioctl_t stioctl; #include "od.h" #if NOD > 0 -d_open_t odopen; -d_close_t odclose; -d_strategy_t odstrategy; -d_ioctl_t odioctl; -d_psize_t odsize; #define oddump nxdump #else #define odopen nxopen @@ -219,11 +179,6 @@ d_psize_t odsize; #include "cd.h" #if NCD > 0 -d_open_t cdopen; -d_close_t cdclose; -d_strategy_t cdstrategy; -d_ioctl_t cdioctl; -d_psize_t cdsize; #define cddump nxdump #else #define cdopen nxopen @@ -236,11 +191,6 @@ d_psize_t cdsize; #include "mcd.h" #if NMCD > 0 -d_open_t mcdopen; -d_close_t mcdclose; -d_strategy_t mcdstrategy; -d_ioctl_t mcdioctl; -d_psize_t mcdsize; #define mcddump nxdump #else #define mcdopen nxopen @@ -253,11 +203,6 @@ d_psize_t mcdsize; #include "scd.h" #if NSCD > 0 -d_open_t scdopen; -d_close_t scdclose; -d_strategy_t scdstrategy; -d_ioctl_t scdioctl; -d_psize_t scdsize; #define scddump nxdump #else #define scdopen nxopen @@ -270,12 +215,6 @@ d_psize_t scdsize; #include "matcd.h" #if NMATCD > 0 -d_open_t matcdopen; -d_close_t matcdclose; -d_strategy_t matcdstrategy; -d_ioctl_t matcdioctl; -d_dump_t matcddump; -d_psize_t matcdsize; #define matcddump nxdump #else #define matcdopen nxopen @@ -288,11 +227,6 @@ d_psize_t matcdsize; #include "ata.h" #if (NATA > 0) -d_open_t ataopen; -d_close_t ataclose; -d_strategy_t atastrategy; -d_ioctl_t ataioctl; -d_psize_t atasize; #define atadump nxdump #else #define ataopen nxopen @@ -305,12 +239,6 @@ d_psize_t atasize; #include "wcd.h" #if NWCD > 0 -d_open_t wcdbopen; -d_open_t wcdropen; -d_close_t wcdbclose; -d_close_t wcdrclose; -d_strategy_t wcdstrategy; -d_ioctl_t wcdioctl; #else #define wcdbopen nxopen #define wcdropen nxopen @@ -322,9 +250,6 @@ d_ioctl_t wcdioctl; #include "ch.h" #if NCH > 0 -d_open_t chopen; -d_close_t chclose; -d_ioctl_t chioctl; #else #define chopen nxopen #define chclose nxclose @@ -333,12 +258,6 @@ d_ioctl_t chioctl; #include "wt.h" #if NWT > 0 -d_open_t wtopen; -d_close_t wtclose; -d_strategy_t wtstrategy; -d_ioctl_t wtioctl; -d_dump_t wtdump; -d_psize_t wtsize; #else #define wtopen nxopen #define wtclose nxclose @@ -350,10 +269,6 @@ d_psize_t wtsize; #include "fd.h" #if NFD > 0 -d_open_t Fdopen; -d_close_t fdclose; -d_strategy_t fdstrategy; -d_ioctl_t fdioctl; #define fddump nxdump #define fdsize zerosize #else @@ -367,12 +282,6 @@ d_ioctl_t fdioctl; #include "vn.h" #if NVN > 0 -d_open_t vnopen; -d_close_t vnclose; -d_strategy_t vnstrategy; -d_ioctl_t vnioctl; -d_dump_t vndump; -d_psize_t vnsize; #else #define vnopen nxopen #define vnclose nxclose @@ -385,12 +294,6 @@ d_psize_t vnsize; /* Matrox Meteor capture card */ #include "meteor.h" #if NMETEOR > 0 -d_open_t meteor_open; -d_close_t meteor_close; -d_read_t meteor_read; -d_write_t meteor_write; -d_ioctl_t meteor_ioctl; -d_mmap_t meteor_mmap; #else #define meteor_open nxopen #define meteor_close nxclose @@ -406,7 +309,6 @@ d_mmap_t meteor_mmap; #define swdump nodump #define swsize (d_psize_t *)enodev -d_rdwr_t swread, swwrite; struct bdevsw bdevsw[] = { @@ -468,27 +370,10 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]); #include "machine/cons.h" /* /dev/mem */ -d_open_t mmopen; -d_close_t mmclose; -d_rdwr_t mmrw; -d_mmap_t memmmap; -d_ioctl_t mmioctl; #define mmselect seltrue #include "pty.h" #if NPTY > 0 -d_open_t ptsopen; -d_close_t ptsclose; -d_rdwr_t ptsread; -d_rdwr_t ptswrite; -d_stop_t ptsstop; -d_open_t ptcopen; -d_close_t ptcclose; -d_rdwr_t ptcread; -d_rdwr_t ptcwrite; -d_select_t ptcselect; -d_ttycv_t ptydevtotty; -d_ioctl_t ptyioctl; #else #define ptsopen nxopen #define ptsclose nxclose @@ -507,12 +392,6 @@ d_ioctl_t ptyioctl; #include "snp.h" #if NSNP > 0 -d_open_t snpopen; -d_close_t snpclose; -d_rdwr_t snpread; -d_rdwr_t snpwrite; -d_select_t snpselect; -d_ioctl_t snpioctl; #else #define snpopen nxopen #define snpclose nxclose @@ -524,19 +403,9 @@ d_ioctl_t snpioctl; /* /dev/klog */ -d_open_t logopen; -d_close_t logclose; -d_rdwr_t logread; -d_ioctl_t logioctl; -d_select_t logselect; #include "bqu.h" #if NBQU > 0 -d_open_t bquopen; -d_close_t bquclose; -d_rdwr_t bquread, bquwrite; -d_select_t bquselect; -d_ioctl_t bquioctl; #else #define bquopen nxopen #define bquclose nxclose @@ -548,10 +417,6 @@ d_ioctl_t bquioctl; #include "lpt.h" #if NLPT > 0 -d_open_t lptopen; -d_close_t lptclose; -d_rdwr_t lptwrite; -d_ioctl_t lptioctl; #else #define lptopen nxopen #define lptclose nxclose @@ -561,11 +426,6 @@ d_ioctl_t lptioctl; #include "tw.h" #if NTW > 0 -d_open_t twopen; -d_close_t twclose; -d_rdwr_t twread, twwrite; -d_select_t twselect; -d_ttycv_t twdevtotty; #else #define twopen nxopen #define twclose nxclose @@ -577,11 +437,6 @@ d_ttycv_t twdevtotty; #include "psm.h" #if NPSM > 0 -d_open_t psmopen; -d_close_t psmclose; -d_rdwr_t psmread; -d_select_t psmselect; -d_ioctl_t psmioctl; #else #define psmopen nxopen #define psmclose nxclose @@ -592,11 +447,6 @@ d_ioctl_t psmioctl; #include "snd.h" /* General Sound Driver */ #if NSND > 0 -d_open_t sndopen; -d_close_t sndclose; -d_ioctl_t sndioctl; -d_rdwr_t sndread, sndwrite; -d_select_t sndselect; #else #define sndopen nxopen #define sndclose nxclose @@ -607,15 +457,9 @@ d_select_t sndselect; #endif /* /dev/fd/NNN */ -d_open_t fdopen; #include "bpfilter.h" #if NBPFILTER > 0 -d_open_t bpfopen; -d_close_t bpfclose; -d_rdwr_t bpfread, bpfwrite; -d_select_t bpfselect; -d_ioctl_t bpfioctl; #else #define bpfopen nxopen #define bpfclose nxclose @@ -627,10 +471,6 @@ d_ioctl_t bpfioctl; #include "speaker.h" #if NSPEAKER > 0 -d_open_t spkropen; -d_close_t spkrclose; -d_rdwr_t spkrwrite; -d_ioctl_t spkrioctl; #else #define spkropen nxopen #define spkrclose nxclose @@ -640,11 +480,6 @@ d_ioctl_t spkrioctl; #include "pca.h" #if NPCA > 0 -d_open_t pcaopen; -d_close_t pcaclose; -d_rdwr_t pcawrite; -d_ioctl_t pcaioctl; -d_select_t pcaselect; #else #define pcaopen nxopen #define pcaclose nxclose @@ -655,10 +490,6 @@ d_select_t pcaselect; #include "mse.h" #if NMSE > 0 -d_open_t mseopen; -d_close_t mseclose; -d_rdwr_t mseread; -d_select_t mseselect; #else #define mseopen nxopen #define mseclose nxclose @@ -668,12 +499,6 @@ d_select_t mseselect; #include "sio.h" #if NSIO > 0 -d_open_t sioopen; -d_close_t sioclose; -d_rdwr_t sioread, siowrite; -d_ioctl_t sioioctl; -d_stop_t siostop; -d_ttycv_t siodevtotty; #define sioreset nxreset #else #define sioopen nxopen @@ -688,13 +513,7 @@ d_ttycv_t siodevtotty; #include "su.h" #if NSU > 0 -d_open_t suopen; -d_close_t suclose; -d_ioctl_t suioctl; -d_rdwr_t suread, suwrite; -d_select_t suselect; #define summap nxmmap -d_strategy_t sustrategy; #else #define suopen nxopen #define suclose nxclose @@ -708,24 +527,15 @@ d_strategy_t sustrategy; #include "scbus.h" #if NSCBUS > 0 -d_open_t ukopen; -d_close_t ukclose; -d_ioctl_t ukioctl; #else #define ukopen nxopen #define ukclose nxclose #define ukioctl nxioctl #endif -d_open_t lkmcopen; -d_close_t lkmcclose; -d_ioctl_t lkmcioctl; #include "apm.h" #if NAPM > 0 -d_open_t apmopen; -d_close_t apmclose; -d_ioctl_t apmioctl; #else #define apmopen nxopen #define apmclose nxclose @@ -734,11 +544,6 @@ d_ioctl_t apmioctl; #include "ctx.h" #if NCTX > 0 -d_open_t ctxopen; -d_close_t ctxclose; -d_rdwr_t ctxread; -d_rdwr_t ctxwrite; -d_ioctl_t ctxioctl; #else #define ctxopen nxopen #define ctxclose nxclose @@ -749,13 +554,7 @@ d_ioctl_t ctxioctl; #include "ssc.h" #if NSSC > 0 -d_open_t sscopen; -d_close_t sscclose; -d_ioctl_t sscioctl; -d_rdwr_t sscread, sscwrite; -d_select_t sscselect; #define sscmmap nxmmap -d_strategy_t sscstrategy; #else #define sscopen nxopen #define sscclose nxclose @@ -769,13 +568,6 @@ d_strategy_t sscstrategy; #include "cx.h" #if NCX > 0 -d_open_t cxopen; -d_close_t cxclose; -d_rdwr_t cxread, cxwrite; -d_ioctl_t cxioctl; -d_select_t cxselect; -d_stop_t cxstop; -d_ttycv_t cxdevtotty; #else #define cxopen nxopen #define cxclose nxclose @@ -789,10 +581,6 @@ d_ttycv_t cxdevtotty; #include "gp.h" #if NGP > 0 -d_open_t gpopen; -d_close_t gpclose; -d_rdwr_t gpwrite; -d_ioctl_t gpioctl; #else #define gpopen nxopen #define gpclose nxclose @@ -802,10 +590,6 @@ d_ioctl_t gpioctl; #include "gsc.h" #if NGSC > 0 -d_open_t gscopen; -d_close_t gscclose; -d_rdwr_t gscread; -d_ioctl_t gscioctl; #else #define gscopen nxopen #define gscclose nxclose @@ -815,11 +599,6 @@ d_ioctl_t gscioctl; #include "crd.h" #if NCRD > 0 -d_open_t crdopen; -d_close_t crdclose; -d_rdwr_t crdread, crdwrite; -d_ioctl_t crdioctl; -d_select_t crdselect; #else #define crdopen nxopen #define crdclose nxclose @@ -832,10 +611,6 @@ d_select_t crdselect; #include "joy.h" #if NJOY > 0 -d_open_t joyopen; -d_close_t joyclose; -d_rdwr_t joyread; -d_ioctl_t joyioctl; #else #define joyopen nxopen #define joyclose nxclose @@ -845,11 +620,6 @@ d_ioctl_t joyioctl; #include "asc.h" #if NASC > 0 -d_open_t ascopen; -d_close_t ascclose; -d_rdwr_t ascread; -d_ioctl_t ascioctl; -d_select_t ascselect; #else #define ascopen nxopen #define ascclose nxclose @@ -860,11 +630,6 @@ d_select_t ascselect; #include "tun.h" #if NTUN > 0 -d_open_t tunopen; -d_close_t tunclose; -d_rdwr_t tunread, tunwrite; -d_ioctl_t tunioctl; -d_select_t tunselect; #else #define tunopen nxopen #define tunclose nxclose @@ -876,12 +641,6 @@ d_select_t tunselect; #include "spigot.h" #if NSPIGOT > 0 -d_open_t spigot_open; -d_close_t spigot_close; -d_ioctl_t spigot_ioctl; -d_rdwr_t spigot_read, spigot_write; -d_select_t spigot_select; -d_mmap_t spigot_mmap; #else #define spigot_open nxopen #define spigot_close nxclose @@ -895,13 +654,6 @@ d_mmap_t spigot_mmap; /* Cyclades serial driver */ #include "cy.h" #if NCY > 0 -d_open_t cyopen; -d_close_t cyclose; -d_read_t cyread; -d_write_t cywrite; -d_ioctl_t cyioctl; -d_stop_t cystop; -d_ttycv_t cydevtotty; #define cyreset nxreset #define cymmap nxmmap #define cystrategy nxstrategy @@ -920,14 +672,7 @@ d_ttycv_t cydevtotty; #include "dgb.h" #if NDGB > 0 -d_open_t dgbopen; -d_close_t dgbclose; -d_rdwr_t dgbread; -d_rdwr_t dgbwrite; -d_ioctl_t dgbioctl; -d_stop_t dgbstop; #define dgbreset nxreset -d_ttycv_t dgbdevtotty; #else #define dgbopen nxopen #define dgbclose nxclose @@ -942,13 +687,6 @@ d_ttycv_t dgbdevtotty; /* Specialix serial driver */ #include "si.h" #if NSI > 0 -d_open_t siopen; -d_close_t siclose; -d_read_t siread; -d_write_t siwrite; -d_ioctl_t siioctl; -d_stop_t sistop; -d_ttycv_t sidevtotty; #define sireset nxreset #else #define siopen nxopen @@ -963,12 +701,6 @@ d_ttycv_t sidevtotty; #include "ity.h" #if NITY > 0 -d_open_t ityopen; -d_close_t ityclose; -d_read_t ityread; -d_write_t itywrite; -d_ioctl_t ityioctl; -d_ttycv_t itydevtotty; #define ityreset nxreset #else #define ityopen nxopen @@ -982,9 +714,6 @@ d_ttycv_t itydevtotty; #include "nic.h" #if NNIC > 0 -d_open_t nicopen; -d_close_t nicclose; -d_ioctl_t nicioctl; #else #define nicopen nxopen #define nicclose nxclose @@ -993,9 +722,6 @@ d_ioctl_t nicioctl; #include "nnic.h" #if NNNIC > 0 -d_open_t nnicopen; -d_close_t nnicclose; -d_ioctl_t nnicioctl; #else #define nnicopen nxopen #define nnicclose nxclose @@ -1004,10 +730,6 @@ d_ioctl_t nnicioctl; #include "isdn.h" #if NISDN > 0 -d_open_t isdnopen; -d_close_t isdnclose; -d_read_t isdnread; -d_ioctl_t isdnioctl; #else #define isdnopen nxopen #define isdnclose nxclose @@ -1017,11 +739,6 @@ d_ioctl_t isdnioctl; #include "itel.h" #if NITEL > 0 -d_open_t itelopen; -d_close_t itelclose; -d_read_t itelread; -d_write_t itelwrite; -d_ioctl_t itelioctl; #else #define itelopen nxopen #define itelclose nxclose @@ -1032,11 +749,6 @@ d_ioctl_t itelioctl; #include "ispy.h" #if NISPY > 0 -d_open_t ispyopen; -d_close_t ispyclose; -d_read_t ispyread; -d_write_t ispywrite; -d_ioctl_t ispyioctl; #else #define ispyopen nxopen #define ispyclose nxclose @@ -1047,12 +759,6 @@ d_ioctl_t ispyioctl; #include "rc.h" #if NRC > 0 -d_open_t rcopen; -d_close_t rcclose; -d_rdwr_t rcread, rcwrite; -d_ioctl_t rcioctl; -d_stop_t rcstop; -d_ttycv_t rcdevtotty; #define rcreset nxreset #else #define rcopen nxopen @@ -1067,10 +773,6 @@ d_ttycv_t rcdevtotty; #include "labpc.h" #if NLABPC > 0 -d_open_t labpcopen; -d_close_t labpcclose; -d_strategy_t labpcstrategy; -d_ioctl_t labpcioctl; #else #define labpcopen nxopen #define labpcclose nxclose diff --git a/sys/i386/include/conf.h b/sys/i386/include/conf.h new file mode 100644 index 000000000000..60e30a845f71 --- /dev/null +++ b/sys/i386/include/conf.h @@ -0,0 +1,298 @@ +d_rdwr_t rawread, rawwrite; +d_open_t wdopen; +d_close_t wdclose; +d_strategy_t wdstrategy; +d_ioctl_t wdioctl; +d_dump_t wddump; +d_psize_t wdsize; +d_open_t wormopen; +d_close_t wormclose; +d_strategy_t wormstrategy; +d_ioctl_t wormioctl; +d_dump_t wormdump; +d_psize_t wormsize; +d_open_t sctargopen; +d_close_t sctargclose; +d_strategy_t sctargstrategy; +d_ioctl_t sctargioctl; +d_dump_t sctargdump; +d_psize_t sctargsize; +d_open_t ptopen; +d_close_t ptclose; +d_strategy_t ptstrategy; +d_ioctl_t ptioctl; +d_dump_t ptdump; +d_psize_t ptsize; +d_open_t sdopen; +d_close_t sdclose; +d_strategy_t sdstrategy; +d_ioctl_t sdioctl; +d_dump_t sddump; +d_psize_t sdsize; +d_open_t stopen; +d_close_t stclose; +d_strategy_t ststrategy; +d_ioctl_t stioctl; +d_open_t odopen; +d_close_t odclose; +d_strategy_t odstrategy; +d_ioctl_t odioctl; +d_psize_t odsize; +d_open_t cdopen; +d_close_t cdclose; +d_strategy_t cdstrategy; +d_ioctl_t cdioctl; +d_psize_t cdsize; +d_open_t mcdopen; +d_close_t mcdclose; +d_strategy_t mcdstrategy; +d_ioctl_t mcdioctl; +d_psize_t mcdsize; +d_open_t scdopen; +d_close_t scdclose; +d_strategy_t scdstrategy; +d_ioctl_t scdioctl; +d_psize_t scdsize; +d_open_t matcdopen; +d_close_t matcdclose; +d_strategy_t matcdstrategy; +d_ioctl_t matcdioctl; +d_dump_t matcddump; +d_psize_t matcdsize; +d_open_t ataopen; +d_close_t ataclose; +d_strategy_t atastrategy; +d_ioctl_t ataioctl; +d_psize_t atasize; +d_open_t wcdbopen; +d_open_t wcdropen; +d_close_t wcdbclose; +d_close_t wcdrclose; +d_strategy_t wcdstrategy; +d_ioctl_t wcdioctl; +d_open_t chopen; +d_close_t chclose; +d_ioctl_t chioctl; +d_open_t wtopen; +d_close_t wtclose; +d_strategy_t wtstrategy; +d_ioctl_t wtioctl; +d_dump_t wtdump; +d_psize_t wtsize; +d_open_t Fdopen; +d_close_t fdclose; +d_strategy_t fdstrategy; +d_ioctl_t fdioctl; +d_open_t vnopen; +d_close_t vnclose; +d_strategy_t vnstrategy; +d_ioctl_t vnioctl; +d_dump_t vndump; +d_psize_t vnsize; +d_open_t meteor_open; +d_close_t meteor_close; +d_read_t meteor_read; +d_write_t meteor_write; +d_ioctl_t meteor_ioctl; +d_mmap_t meteor_mmap; +d_rdwr_t swread, swwrite; +d_open_t mmopen; +d_close_t mmclose; +d_rdwr_t mmrw; +d_mmap_t memmmap; +d_ioctl_t mmioctl; +d_open_t ptsopen; +d_close_t ptsclose; +d_rdwr_t ptsread; +d_rdwr_t ptswrite; +d_stop_t ptsstop; +d_open_t ptcopen; +d_close_t ptcclose; +d_rdwr_t ptcread; +d_rdwr_t ptcwrite; +d_select_t ptcselect; +d_ttycv_t ptydevtotty; +d_ioctl_t ptyioctl; +d_open_t snpopen; +d_close_t snpclose; +d_rdwr_t snpread; +d_rdwr_t snpwrite; +d_select_t snpselect; +d_ioctl_t snpioctl; +d_open_t logopen; +d_close_t logclose; +d_rdwr_t logread; +d_ioctl_t logioctl; +d_select_t logselect; +d_open_t bquopen; +d_close_t bquclose; +d_rdwr_t bquread, bquwrite; +d_select_t bquselect; +d_ioctl_t bquioctl; +d_open_t lptopen; +d_close_t lptclose; +d_rdwr_t lptwrite; +d_ioctl_t lptioctl; +d_open_t twopen; +d_close_t twclose; +d_rdwr_t twread, twwrite; +d_select_t twselect; +d_ttycv_t twdevtotty; +d_open_t psmopen; +d_close_t psmclose; +d_rdwr_t psmread; +d_select_t psmselect; +d_ioctl_t psmioctl; +d_open_t sndopen; +d_close_t sndclose; +d_ioctl_t sndioctl; +d_rdwr_t sndread, sndwrite; +d_select_t sndselect; +d_open_t fdopen; +d_open_t bpfopen; +d_close_t bpfclose; +d_rdwr_t bpfread, bpfwrite; +d_select_t bpfselect; +d_ioctl_t bpfioctl; +d_open_t spkropen; +d_close_t spkrclose; +d_rdwr_t spkrwrite; +d_ioctl_t spkrioctl; +d_open_t pcaopen; +d_close_t pcaclose; +d_rdwr_t pcawrite; +d_ioctl_t pcaioctl; +d_select_t pcaselect; +d_open_t mseopen; +d_close_t mseclose; +d_rdwr_t mseread; +d_select_t mseselect; +d_open_t sioopen; +d_close_t sioclose; +d_rdwr_t sioread, siowrite; +d_ioctl_t sioioctl; +d_stop_t siostop; +d_ttycv_t siodevtotty; +d_open_t suopen; +d_close_t suclose; +d_ioctl_t suioctl; +d_rdwr_t suread, suwrite; +d_select_t suselect; +d_strategy_t sustrategy; +d_open_t ukopen; +d_close_t ukclose; +d_ioctl_t ukioctl; +d_open_t lkmcopen; +d_close_t lkmcclose; +d_ioctl_t lkmcioctl; +d_open_t apmopen; +d_close_t apmclose; +d_ioctl_t apmioctl; +d_open_t ctxopen; +d_close_t ctxclose; +d_rdwr_t ctxread; +d_rdwr_t ctxwrite; +d_ioctl_t ctxioctl; +d_open_t sscopen; +d_close_t sscclose; +d_ioctl_t sscioctl; +d_rdwr_t sscread, sscwrite; +d_select_t sscselect; +d_strategy_t sscstrategy; +d_open_t cxopen; +d_close_t cxclose; +d_rdwr_t cxread, cxwrite; +d_ioctl_t cxioctl; +d_select_t cxselect; +d_stop_t cxstop; +d_ttycv_t cxdevtotty; +d_open_t gpopen; +d_close_t gpclose; +d_rdwr_t gpwrite; +d_ioctl_t gpioctl; +d_open_t gscopen; +d_close_t gscclose; +d_rdwr_t gscread; +d_ioctl_t gscioctl; +d_open_t crdopen; +d_close_t crdclose; +d_rdwr_t crdread, crdwrite; +d_ioctl_t crdioctl; +d_select_t crdselect; +d_open_t joyopen; +d_close_t joyclose; +d_rdwr_t joyread; +d_ioctl_t joyioctl; +d_open_t ascopen; +d_close_t ascclose; +d_rdwr_t ascread; +d_ioctl_t ascioctl; +d_select_t ascselect; +d_open_t tunopen; +d_close_t tunclose; +d_rdwr_t tunread, tunwrite; +d_ioctl_t tunioctl; +d_select_t tunselect; +d_open_t spigot_open; +d_close_t spigot_close; +d_ioctl_t spigot_ioctl; +d_rdwr_t spigot_read, spigot_write; +d_select_t spigot_select; +d_mmap_t spigot_mmap; +d_open_t cyopen; +d_close_t cyclose; +d_read_t cyread; +d_write_t cywrite; +d_ioctl_t cyioctl; +d_stop_t cystop; +d_ttycv_t cydevtotty; +d_open_t dgbopen; +d_close_t dgbclose; +d_rdwr_t dgbread; +d_rdwr_t dgbwrite; +d_ioctl_t dgbioctl; +d_stop_t dgbstop; +d_ttycv_t dgbdevtotty; +d_open_t siopen; +d_close_t siclose; +d_read_t siread; +d_write_t siwrite; +d_ioctl_t siioctl; +d_stop_t sistop; +d_ttycv_t sidevtotty; +d_open_t ityopen; +d_close_t ityclose; +d_read_t ityread; +d_write_t itywrite; +d_ioctl_t ityioctl; +d_ttycv_t itydevtotty; +d_open_t nicopen; +d_close_t nicclose; +d_ioctl_t nicioctl; +d_open_t nnicopen; +d_close_t nnicclose; +d_ioctl_t nnicioctl; +d_open_t isdnopen; +d_close_t isdnclose; +d_read_t isdnread; +d_ioctl_t isdnioctl; +d_open_t itelopen; +d_close_t itelclose; +d_read_t itelread; +d_write_t itelwrite; +d_ioctl_t itelioctl; +d_open_t ispyopen; +d_close_t ispyclose; +d_read_t ispyread; +d_write_t ispywrite; +d_ioctl_t ispyioctl; +d_open_t rcopen; +d_close_t rcclose; +d_rdwr_t rcread, rcwrite; +d_ioctl_t rcioctl; +d_stop_t rcstop; +d_ttycv_t rcdevtotty; +d_open_t labpcopen; +d_close_t labpcclose; +d_strategy_t labpcstrategy; +d_ioctl_t labpcioctl; diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 0ac16d616e14..786ae30f13d4 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 bca87e11c569..150e6924fee0 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 ff24f71603dd..830cf5b336da 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 d22984d3675d..2b6b03645e35 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 232294bc03ec..58f26bb2c3e6 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 370a59e3cea1..03507e457bab 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 831d53e42684..c7bbe07771b5 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 0c1c69ebae30..06bd4555cef0 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 0f6b33f25685..18d7a452fe2d 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 9f1a19697ec8..381ea31f7fb8 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 1674923447c9..5590725a4852 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 */ diff --git a/sys/isa/fd.c b/sys/isa/fd.c index bca87e11c569..150e6924fee0 100644 --- a/sys/isa/fd.c +++ b/sys/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/isa/sio.c b/sys/isa/sio.c index 0f6b33f25685..18d7a452fe2d 100644 --- a/sys/isa/sio.c +++ b/sys/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/kern/tty_pty.c b/sys/kern/tty_pty.c index a13cb0abc90f..2baaea2d113f 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_pty.c,v 1.22 1995/10/25 18:23:58 bde Exp $ + * $Id: tty_pty.c,v 1.23 1995/10/30 17:16:55 bde Exp $ */ /* @@ -82,8 +82,6 @@ int npty = NPTY; /* for pstat -t */ #define PF_NOSTOP 0x40 #define PF_UCNTL 0x80 /* user control mode */ -void ptsstop __P((struct tty *, int)); - /* * Establish n (or default if n is 1) ptys in the system. * diff --git a/sys/net/bpf.h b/sys/net/bpf.h index 8ac0ed057f5d..2be863546d53 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -37,7 +37,7 @@ * * @(#)bpf.h 8.1 (Berkeley) 6/10/93 * - * $Id: bpf.h,v 1.5 1995/06/15 18:10:59 pst Exp $ + * $Id: bpf.h,v 1.6 1995/09/08 11:08:55 bde Exp $ */ #ifndef _NET_BPF_H_ @@ -239,12 +239,6 @@ struct bpf_insn { #ifdef KERNEL int bpf_validate __P((struct bpf_insn *, int)); -int bpfopen __P((dev_t, int, int, struct proc *)); -int bpfclose __P((dev_t, int, int, struct proc *)); -int bpfread __P((dev_t, struct uio *, int)); -int bpfwrite __P((dev_t, struct uio *, int)); -int bpfioctl __P((dev_t, int, caddr_t, int, struct proc *)); -int bpf_select __P((dev_t, int, struct proc *)); void bpf_tap __P((caddr_t, u_char *, u_int)); void bpf_mtap __P((caddr_t, struct mbuf *)); void bpfattach __P((caddr_t *, struct ifnet *, u_int, u_int)); diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index b23303919e88..65f36e212437 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -72,15 +72,9 @@ int tundebug = 0; struct tun_softc tunctl[NTUN]; -d_open_t tunopen; -d_close_t tunclose; int tunoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *rt)); -d_rdwr_t tunread; -d_rdwr_t tunwrite; -d_ioctl_t tunioctl; int tunifioctl __P((struct ifnet *, int, caddr_t)); -d_select_t tunselect; static struct cdevsw tuncdevsw = { tunopen, tunclose, tunread, tunwrite, diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index d5dfb0cf646e..f15288c69556 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -73,19 +73,6 @@ struct kern_devconf kdc_pccard0 = { #define MIN(a,b) ((a)<(b)?(a):(b)) -/* - * cdevsw entry points - */ -int crdopen __P((dev_t dev, int oflags, int devtype, - struct proc *p)); -int crdclose __P((dev_t dev, int fflag, int devtype, - struct proc *p)); -int crdread __P((dev_t dev, struct uio *uio, int ioflag)); -int crdwrite __P((dev_t dev, struct uio *uio, int ioflag)); -int crdioctl __P((dev_t dev, int cmd, caddr_t data, - int fflag, struct proc *p)); -int crdselect __P((dev_t dev, int rw, struct proc *p)); - static int allocate_driver(struct slot *, struct drv_desc *); static void inserted(void *); static void disable_slot(struct slot *); diff --git a/sys/scsi/scsi_driver.h b/sys/scsi/scsi_driver.h index ec2e1c8243e5..86e91854875a 100644 --- a/sys/scsi/scsi_driver.h +++ b/sys/scsi/scsi_driver.h @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_driver.h,v 1.3 1995/04/14 15:10:34 dufault Exp $ + * $Id: scsi_driver.h,v 1.4 1995/05/30 08:13:39 rgrimes Exp $ * */ #ifndef _SCSI__DRIVER_H_ @@ -61,16 +61,6 @@ int scsi_ioctl __P((dev_t, u_int32, caddr_t, int, struct proc *, void scsi_strategy __P((struct buf *, struct scsi_device *)); void scsi_minphys __P((struct buf *, struct scsi_device *)); -int suopen __P((dev_t, int, int, struct proc *)); -int suclose __P((dev_t, int, int, struct proc *)); -void sustrategy __P((struct buf *)); -int suioctl __P((dev_t, int, caddr_t, int, struct proc *)); -int sudump __P((dev_t)); -int supsize __P((dev_t)); -int suread __P((dev_t, struct uio *, int)); -int suwrite __P((dev_t, struct uio *, int)); -int suselect __P((dev_t, int, struct proc *)); - #endif /* KERNEL */ #endif /* _SCSI__DRIVER_H_ */ diff --git a/sys/scsi/st.c b/sys/scsi/st.c index cdb2e8d4197b..9910c42b3cc6 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: st.c,v 1.40 1995/10/12 02:05:47 julian Exp $ + * $Id: st.c,v 1.41 1995/10/21 23:13:10 phk Exp $ */ /* @@ -166,7 +166,6 @@ static errval st_load __P((u_int32 unit, u_int32 type, u_int32 flags)); static errval st_mode_select __P((u_int32 unit, u_int32 flags, \ struct tape_pages *page, u_int32 pagelen)); static errval st_comp __P((u_int32 unit, u_int32 mode)); -void ststrategy(); static int32 st_chkeod(); static void ststart(u_int32 unit, u_int32 flags); static void st_unmount(); diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 4254f263cb03..c64a88baad75 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.3 (Berkeley) 1/21/94 - * $Id: conf.h,v 1.17 1995/09/10 21:36:12 bde Exp $ + * $Id: conf.h,v 1.18 1995/10/04 03:43:18 julian Exp $ */ #ifndef _SYS_CONF_H_ @@ -166,4 +166,6 @@ int bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw *old)); #endif #endif +#include <machine/conf.h> + #endif /* !_SYS_CONF_H_ */ diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index 4254f263cb03..c64a88baad75 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.3 (Berkeley) 1/21/94 - * $Id: conf.h,v 1.17 1995/09/10 21:36:12 bde Exp $ + * $Id: conf.h,v 1.18 1995/10/04 03:43:18 julian Exp $ */ #ifndef _SYS_CONF_H_ @@ -166,4 +166,6 @@ int bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw *old)); #endif #endif +#include <machine/conf.h> + #endif /* !_SYS_CONF_H_ */ diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h index 339dd96a8fa4..694d9fa6ae3d 100644 --- a/sys/sys/snoop.h +++ b/sys/sys/snoop.h @@ -70,16 +70,10 @@ struct snoop { #ifdef KERNEL /* XXX several wrong storage classes and types here. */ -int snpclose __P((dev_t dev, int flags, int fmt, struct proc *p)); int snp_detach __P((struct snoop *snp)); int snpdown __P((struct snoop *snp)); int snpin __P((struct snoop *snp, char *buf, int n)); int snpinc __P((struct snoop *snp, char c)); -int snpioctl __P((dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)); -int snpopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int snpread __P((dev_t dev, struct uio *uio, int flag)); -int snpselect __P((dev_t dev, int rw, struct proc *p)); -int snpwrite __P((dev_t dev, struct uio *uio, int flag)); #endif /* KERNEL */ #endif /* _SNOOP_H_ */ |