diff options
author | phk <phk@FreeBSD.org> | 1999-09-25 18:24:47 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-09-25 18:24:47 +0000 |
commit | e9e05122106077f828fbbd0964036c22503d1633 (patch) | |
tree | a2c7d461d93e3013c84a30e06340b510ec96aaa9 /sys/dev | |
parent | a0c34c5a2300c81f85c92ac6327b1d2ad3a56a77 (diff) | |
download | FreeBSD-src-e9e05122106077f828fbbd0964036c22503d1633.zip FreeBSD-src-e9e05122106077f828fbbd0964036c22503d1633.tar.gz |
Remove five now unused fields from struct cdevsw. They should never
have been there in the first place. A GENERIC kernel shrinks almost 1k.
Add a slightly different safetybelt under nostop for tty drivers.
Add some missing FreeBSD tags
Diffstat (limited to 'sys/dev')
45 files changed, 6 insertions, 224 deletions
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 44b9b99..4ca4e81 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -64,19 +64,14 @@ static struct cdevsw ad_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ noioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ adstrategy, /* name */ "ad", - /* parms */ noparms, /* maj */ 116, /* dump */ addump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ 30, }; static struct cdevsw addisk_cdevsw; diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index dc4e649..620ac7d 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -61,19 +61,14 @@ static struct cdevsw acd_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ acdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ acdstrategy, /* name */ "acd", - /* parms */ noparms, /* maj */ 117, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ 31 }; diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index 2063c63..897bb2d 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -61,19 +61,14 @@ static struct cdevsw afd_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ afdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ afdstrategy, /* name */ "afd", - /* parms */ noparms, /* maj */ 118, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ 32, }; static struct cdevsw afddisk_cdevsw; diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index 1c74c95..f2f20de 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -58,19 +58,14 @@ static struct cdevsw ast_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ astioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ aststrategy, /* name */ "ast", - /* parms */ noparms, /* maj */ 119, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TAPE, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 6e861cc..747d2df 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -327,19 +327,14 @@ static struct cdevsw psm_cdevsw = { /* read */ psmread, /* write */ nowrite, /* ioctl */ psmioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ psmpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "psm", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index f0e0f1e..cffa17a 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -6951,19 +6951,14 @@ static struct cdevsw bktr_cdevsw = { /* read */ bktr_read, /* write */ bktr_write, /* ioctl */ bktr_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ bktr_poll, /* mmap */ bktr_mmap, /* strategy */ nostrategy, /* name */ "bktr", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 06592b5..f5309b8 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -177,19 +177,14 @@ static struct cdevsw ccd_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ ccdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ ccdstrategy, /* name */ "ccd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ ccddump, /* psize */ ccdsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 8f2109c..472544a 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -378,19 +378,14 @@ static struct cdevsw sio_cdevsw = { /* read */ sioread, /* write */ siowrite, /* ioctl */ sioioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ driver_name, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 8f2109c..472544a 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -378,19 +378,14 @@ static struct cdevsw sio_cdevsw = { /* read */ sioread, /* write */ siowrite, /* ioctl */ sioioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ driver_name, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index 0f24e8c..ea7b548 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -215,19 +215,14 @@ static struct cdevsw dgb_cdevsw = { /* read */ dgbread, /* write */ dgbwrite, /* ioctl */ dgbioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "dgb", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c index ecf6827..4a2ec53 100644 --- a/sys/dev/dgb/dgm.c +++ b/sys/dev/dgb/dgm.c @@ -219,19 +219,14 @@ static struct cdevsw dgm_cdevsw = { /* read */ dgmread, /* write */ dgmwrite, /* ioctl */ dgmioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "dgm", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c index c676d81..474eb88 100644 --- a/sys/dev/dpt/dpt_control.c +++ b/sys/dev/dpt/dpt_control.c @@ -97,19 +97,14 @@ static struct cdevsw dpt_cdevsw = { /* read */ dpt_read, /* write */ dpt_write, /* ioctl */ dpt_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "dpt", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 86628aa..59ac170 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -365,19 +365,14 @@ static struct cdevsw fb_cdevsw = { /* read */ fbread, /* write */ fbwrite, /* ioctl */ fbioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ fbmmap, /* strategy */ nostrategy, /* name */ FB_DRIVER_NAME, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index f51161b..e63a75b 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -370,19 +370,14 @@ static struct cdevsw fd_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ fdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ fdstrategy, /* name */ "fd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c index 5db01f9..5f136c8 100644 --- a/sys/dev/hfa/fore_load.c +++ b/sys/dev/hfa/fore_load.c @@ -1529,19 +1529,14 @@ static struct cdevsw fore_cdev = { /* read */ noread, /* write */ nowrite, /* ioctl */ noioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ noname, - /* parms */ noparms, /* maj */ -1, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index 6ec65cb..492010a 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -77,19 +77,14 @@ static struct cdevsw id_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ idioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ idstrategy, /* name */ "id", - /* parms */ noparms, /* maj */ ID_CDEV_MAJOR, /* dump */ nodump, /* psize */ idsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ ID_BDEV_MAJOR }; static struct cdevsw stolen_cdevsw; diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c index 158449e..de490b7 100644 --- a/sys/dev/iicbus/iic.c +++ b/sys/dev/iicbus/iic.c @@ -98,19 +98,14 @@ static struct cdevsw iic_cdevsw = { /* read */ iicread, /* write */ iicwrite, /* ioctl */ iicioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "iic", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index 56c90d1..5d23958 100644 --- a/sys/dev/joy/joy.c +++ b/sys/dev/joy/joy.c @@ -25,6 +25,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * + * $FreeBSD$ + * */ #include "joy.h" @@ -89,19 +91,14 @@ static struct cdevsw joy_cdevsw = { /* read */ joyread, /* write */ nowrite, /* ioctl */ joyioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "joy", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index 945df72..0950f35 100644 --- a/sys/dev/kbd/kbd.c +++ b/sys/dev/kbd/kbd.c @@ -393,19 +393,14 @@ static struct cdevsw kbd_cdevsw = { /* read */ genkbdread, /* write */ genkbdwrite, /* ioctl */ genkbdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ genkbdpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "kbd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index b49cd55..e4da168 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -214,19 +214,14 @@ static struct cdevsw mcd_cdevsw = { /* read */ physread, /* write */ nowrite, /* ioctl */ mcdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ mcdstrategy, /* name */ "mcd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index d25d364..e7f46f5 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -44,19 +44,14 @@ static struct cdevsw md_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ mdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ mdstrategy, /* name */ "md", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK | D_CANFREE, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; static struct cdevsw mddisk_cdevsw; diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index f6d6c66..5f9f2c0 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -83,19 +83,14 @@ static struct cdevsw mse_cdevsw = { /* read */ mseread, /* write */ nowrite, /* ioctl */ mseioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ msepoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "mse", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 3792940..a8502bc 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -896,19 +896,14 @@ static struct cdevsw pcicdev = { /* read */ noread, /* write */ nowrite, /* ioctl */ pci_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "pci", - /* parms */ noparms, /* maj */ PCI_CDEV, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/pcm/sound.c b/sys/dev/pcm/sound.c index 570e51f..8aff3e6 100644 --- a/sys/dev/pcm/sound.c +++ b/sys/dev/pcm/sound.c @@ -57,19 +57,14 @@ static struct cdevsw snd_cdevsw = { /* read */ sndread, /* write */ sndwrite, /* ioctl */ sndioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ sndpoll, /* mmap */ sndmmap, /* strategy */ nostrategy, /* name */ "snd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c index 56312b4..7120321 100644 --- a/sys/dev/ppbus/lpt.c +++ b/sys/dev/ppbus/lpt.c @@ -203,19 +203,14 @@ static struct cdevsw lpt_cdevsw = { /* read */ lptread, /* write */ lptwrite, /* ioctl */ lptioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ LPT_NAME, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c index 0d8c970..c610e7f 100644 --- a/sys/dev/ppbus/ppi.c +++ b/sys/dev/ppbus/ppi.c @@ -97,19 +97,14 @@ static struct cdevsw ppi_cdevsw = { /* read */ ppiread, /* write */ ppiwrite, /* ioctl */ ppiioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ppi", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c index 14204b1..1189c58 100644 --- a/sys/dev/ppbus/pps.c +++ b/sys/dev/ppbus/pps.c @@ -60,19 +60,14 @@ static struct cdevsw pps_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ ppsioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ PPS_NAME, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 238a052..91b735e 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -98,19 +98,14 @@ static struct cdevsw rc_cdevsw = { /* read */ rcread, /* write */ rcwrite, /* ioctl */ rcioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "rc", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index d788b57..5a4cceb 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -805,19 +805,14 @@ static struct cdevsw rp_cdevsw = { /* read */ rpread, /* write */ rpwrite, /* ioctl */ rpioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ driver_name, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index b76c2d6..a615f49 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -187,19 +187,14 @@ static struct cdevsw scd_cdevsw = { /* read */ physread, /* write */ nowrite, /* ioctl */ scdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ scdstrategy, /* name */ "scd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index a1cde6e..79097ca 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -180,19 +180,14 @@ static struct cdevsw si_cdevsw = { /* read */ siread, /* write */ siwrite, /* ioctl */ siioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "si", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 28c54db..ace8592 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -347,19 +347,14 @@ static struct cdevsw sio_cdevsw = { /* read */ sioread, /* write */ siowrite, /* ioctl */ sioioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ driver_name, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c index b089435..331e6b9 100644 --- a/sys/dev/smbus/smb.c +++ b/sys/dev/smbus/smb.c @@ -99,19 +99,14 @@ static struct cdevsw smb_cdevsw = { /* read */ smbread, /* write */ smbwrite, /* ioctl */ smbioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "smb", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index e30b293..9105e26 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -49,19 +49,14 @@ static struct cdevsw snp_cdevsw = { /* read */ snpread, /* write */ snpwrite, /* ioctl */ snpioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ snppoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "snp", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 570e51f..8aff3e6 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -57,19 +57,14 @@ static struct cdevsw snd_cdevsw = { /* read */ sndread, /* write */ sndwrite, /* ioctl */ sndioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ sndpoll, /* mmap */ sndmmap, /* strategy */ nostrategy, /* name */ "snd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 39d50c4..10cc4a1 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -34,19 +34,14 @@ static struct cdevsw spkr_cdevsw = { /* read */ noread, /* write */ spkrwrite, /* ioctl */ spkrioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "spkr", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c index f8e1348..cab0d46 100644 --- a/sys/dev/streams/streams.c +++ b/sys/dev/streams/streams.c @@ -107,19 +107,14 @@ static struct cdevsw streams_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ noioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "streams", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 6ea829f..4cff39f 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -215,19 +215,14 @@ static struct cdevsw sc_cdevsw = { /* read */ scread, /* write */ scwrite, /* ioctl */ scioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ scmmap, /* strategy */ nostrategy, /* name */ "sc", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; @@ -481,7 +476,7 @@ scopen(dev_t dev, int flag, int mode, struct proc *p) tp = dev->si_tty = ttymalloc(dev->si_tty); tp->t_oproc = (SC_VTY(dev) == SC_MOUSE) ? scmousestart : scstart; tp->t_param = scparam; - tp->t_stop = nostop; + tp->t_stop = nottystop; tp->t_dev = dev; if (!(tp->t_state & TS_ISOPEN)) { ttychars(tp); diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 2182cbe..882a3a1 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -126,19 +126,14 @@ static struct cdevsw ugen_cdevsw = { /* read */ ugenread, /* write */ ugenwrite, /* ioctl */ ugenioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ugenpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ugen", - /* parms */ noparms, /* maj */ UGEN_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #endif diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 06d8485..9d1b28c 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -138,19 +138,14 @@ static struct cdevsw uhid_cdevsw = { /* read */ uhidread, /* write */ uhidwrite, /* ioctl */ uhidioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ uhidpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "uhid", - /* parms */ noparms, /* maj */ UHID_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #endif diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 6f178dd..da1ca4b 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -136,19 +136,14 @@ static struct cdevsw ulpt_cdevsw = { /* read */ noread, /* write */ ulptwrite, /* ioctl */ ulptioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ulpt", - /* parms */ noparms, /* maj */ ULPT_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #endif diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index 3a027d2..ed88d95 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -136,19 +136,14 @@ static struct cdevsw ums_cdevsw = { /* read */ ums_read, /* write */ nowrite, /* ioctl */ ums_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ums_poll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ums", - /* parms */ noparms, /* maj */ UMS_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index c6b825d..5713d62 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -121,19 +121,14 @@ struct cdevsw usb_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ usbioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ usbpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "usb", - /* parms */ noparms, /* maj */ USB_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #endif diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c index c70b1c7..e32e741 100644 --- a/sys/dev/vinum/vinum.c +++ b/sys/dev/vinum/vinum.c @@ -54,10 +54,10 @@ extern struct mc malloced[]; STATIC struct cdevsw vinum_cdevsw = { vinumopen, vinumclose, physread, physwrite, - vinumioctl, nostop, noreset, nodevtotty, + vinumioctl, seltrue, nommap, vinumstrategy, "vinum", - noparms, CDEV_MAJOR, vinumdump, vinumsize, - D_DISK, 0, BDEV_MAJOR + CDEV_MAJOR, vinumdump, vinumsize, + D_DISK, BDEV_MAJOR }; /* Called by main() during pseudo-device attachment. */ diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index 4fafe84..377c37d 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -113,19 +113,14 @@ static struct cdevsw vn_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ vnioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ vnstrategy, /* name */ "vn", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ vnsize, /* flags */ D_DISK|D_CANFREE, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; |