diff options
147 files changed, 40 insertions, 752 deletions
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c index 99bb4cc..35a2773 100644 --- a/sys/alpha/alpha/mem.c +++ b/sys/alpha/alpha/mem.c @@ -84,19 +84,14 @@ static struct cdevsw mem_cdevsw = { /* read */ mmrw, /* write */ mmrw, /* ioctl */ mmioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ mmpoll, /* mmap */ memmmap, /* strategy */ nostrategy, /* name */ "mem", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_MEM, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c index 3790021..14305fb 100644 --- a/sys/alpha/alpha/promcons.c +++ b/sys/alpha/alpha/promcons.c @@ -72,19 +72,14 @@ static struct cdevsw prom_cdevsw = { /* read */ promread, /* write */ promwrite, /* ioctl */ promioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "prom", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c index 9e2d7dc..9c3944b 100644 --- a/sys/alpha/tlsb/zs_tlsb.c +++ b/sys/alpha/tlsb/zs_tlsb.c @@ -75,19 +75,14 @@ static struct cdevsw zs_cdevsw = { /* read */ zsread, /* write */ zswrite, /* ioctl */ zsioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "zs", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index 42e9b14..9998379 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -84,19 +84,14 @@ static struct cdevsw mem_cdevsw = { /* read */ mmrw, /* write */ mmrw, /* ioctl */ mmioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ mmpoll, /* mmap */ memmmap, /* strategy */ nostrategy, /* name */ "mem", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_MEM, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index d203aa1..0c3909d 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -562,19 +562,14 @@ static struct cdevsw xpt_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ xptioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "xpt", - /* parms */ noparms, /* maj */ XPT_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 5e9d1d2..a66231e 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -248,19 +248,14 @@ static struct cdevsw cd_cdevsw = { /* read */ physread, /* write */ nowrite, /* ioctl */ cdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ cdstrategy, /* name */ "cd", - /* parms */ noparms, /* maj */ CD_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ CD_BDEV_MAJOR }; diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c index 27d04e3..cc1bdb7 100644 --- a/sys/cam/scsi/scsi_ch.c +++ b/sys/cam/scsi/scsi_ch.c @@ -219,19 +219,14 @@ static struct cdevsw ch_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ chioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ch", - /* parms */ noparms, /* maj */ CH_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index aa2ff80..6f29732 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -243,19 +243,14 @@ static struct cdevsw da_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ daioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ dastrategy, /* name */ "da", - /* parms */ noparms, /* maj */ DA_CDEV_MAJOR, /* dump */ dadump, /* psize */ dasize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ DA_BDEV_MAJOR }; diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index 95b2204..4dbcabb 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -119,19 +119,14 @@ static struct cdevsw pass_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ passioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ passstrategy, /* name */ "pass", - /* parms */ noparms, /* maj */ PASS_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c index 72350cb..1c29548 100644 --- a/sys/cam/scsi/scsi_pt.c +++ b/sys/cam/scsi/scsi_pt.c @@ -123,19 +123,14 @@ static struct cdevsw pt_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ ptioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ ptstrategy, /* name */ "pt", - /* parms */ noparms, /* maj */ PT_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index 225b32e..8fe675d 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -349,19 +349,14 @@ static struct cdevsw sa_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ saioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ sastrategy, /* name */ "sa", - /* parms */ noparms, /* maj */ SA_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TAPE, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c index 70a50ea..0a16385 100644 --- a/sys/cam/scsi/scsi_target.c +++ b/sys/cam/scsi/scsi_target.c @@ -172,19 +172,14 @@ static struct cdevsw targ_cdevsw = { /* read */ targread, /* write */ targwrite, /* ioctl */ targioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ targpoll, /* mmap */ nommap, /* strategy */ targstrategy, /* name */ "targ", - /* parms */ noparms, /* maj */ TARG_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c index ea16d15..f7143bd 100644 --- a/sys/coda/coda_fbsd.c +++ b/sys/coda/coda_fbsd.c @@ -71,19 +71,14 @@ static struct cdevsw codadevsw = { /* read */ vc_nb_read, /* write */ vc_nb_write, /* ioctl */ vc_nb_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ vc_nb_poll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "Coda", - /* parms */ noparms, /* maj */ VC_DEV_NO, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c index b8998d6..b33100c 100644 --- a/sys/contrib/dev/fla/fla.c +++ b/sys/contrib/dev/fla/fla.c @@ -63,19 +63,14 @@ static struct cdevsw fla_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ flaioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ flastrategy, /* name */ "fla", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK | D_CANFREE, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; static struct cdevsw fladisk_cdevsw; 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 }; diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c index ea16d15..f7143bd 100644 --- a/sys/fs/coda/coda_fbsd.c +++ b/sys/fs/coda/coda_fbsd.c @@ -71,19 +71,14 @@ static struct cdevsw codadevsw = { /* read */ vc_nb_read, /* write */ vc_nb_write, /* ioctl */ vc_nb_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ vc_nb_poll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "Coda", - /* parms */ noparms, /* maj */ VC_DEV_NO, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index 5c003f9..4a07946 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -243,8 +243,8 @@ spec_open(ap) struct tty *tp; tp = dev->si_tty; if (!tp->t_stop) { - printf("Warning:%s: no t_stop, using nostop\n", devtoname(dev)); - tp->t_stop = nostop; + printf("Warning:%s: no t_stop, using nottystop\n", devtoname(dev)); + tp->t_stop = nottystop; } } } diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index 06592b5..f5309b8 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_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/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index 0f24e8c..ea7b548 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/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/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c index ecf6827..4a2ec53 100644 --- a/sys/gnu/i386/isa/dgm.c +++ b/sys/gnu/i386/isa/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/i386/apm/apm.c b/sys/i386/apm/apm.c index 620da58..d6752b7 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -108,19 +108,14 @@ static struct cdevsw apm_cdevsw = { /* read */ noread, /* write */ apmwrite, /* ioctl */ apmioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ apmpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "apm", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 620da58..d6752b7 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -108,19 +108,14 @@ static struct cdevsw apm_cdevsw = { /* read */ noread, /* write */ apmwrite, /* ioctl */ apmioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ apmpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "apm", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index 42e9b14..9998379 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -84,19 +84,14 @@ static struct cdevsw mem_cdevsw = { /* read */ mmrw, /* write */ mmrw, /* ioctl */ mmioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ mmpoll, /* mmap */ memmmap, /* strategy */ nostrategy, /* name */ "mem", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_MEM, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c index 60775d1..574f416 100644 --- a/sys/i386/i386/perfmon.c +++ b/sys/i386/i386/perfmon.c @@ -65,19 +65,14 @@ static struct cdevsw perfmon_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ perfmon_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "perfmon", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c index b03cf04..bcb344a 100644 --- a/sys/i386/isa/asc.c +++ b/sys/i386/isa/asc.c @@ -193,19 +193,14 @@ static struct cdevsw asc_cdevsw = { /* read */ ascread, /* write */ nowrite, /* ioctl */ ascioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ascpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "asc", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c index e4b9ddc..a494a6c 100644 --- a/sys/i386/isa/atapi-cd.c +++ b/sys/i386/isa/atapi-cd.c @@ -62,19 +62,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 */ "wcd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c index efd8429..462ca28 100644 --- a/sys/i386/isa/ctx.c +++ b/sys/i386/isa/ctx.c @@ -146,19 +146,14 @@ static struct cdevsw ctx_cdevsw = { /* read */ ctxread, /* write */ ctxwrite, /* ioctl */ ctxioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ctx", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c index 0f5f408..1eeb42e 100644 --- a/sys/i386/isa/cx.c +++ b/sys/i386/isa/cx.c @@ -97,19 +97,14 @@ struct cdevsw cx_cdevsw = { /* read */ cxread, /* write */ cxwrite, /* ioctl */ cxioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "cx", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; #else diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 8f2109c..472544a 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/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/i386/isa/gpib.c b/sys/i386/isa/gpib.c index a809a2e..58a35a6 100644 --- a/sys/i386/isa/gpib.c +++ b/sys/i386/isa/gpib.c @@ -16,6 +16,7 @@ * or modify this software as long as this message is kept with the software, * all derivative works or modified versions. * + * $FreeBSD$ * */ /*Please read the README file for usage information*/ @@ -75,19 +76,14 @@ static struct cdevsw gp_cdevsw = { /* read */ noread, /* write */ gpwrite, /* ioctl */ gpioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "gp", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c index b7f429a..3b3f0f3 100644 --- a/sys/i386/isa/gsc.c +++ b/sys/i386/isa/gsc.c @@ -30,6 +30,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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 "gsc.h" @@ -188,19 +191,14 @@ static struct cdevsw gsc_cdevsw = { /* read */ gscread, /* write */ nowrite, /* ioctl */ gscioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "gsc", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c index 9ca2275..c0c7f9f 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -640,19 +640,14 @@ static struct cdevsw stli_cdevsw = { /* read */ stliread, /* write */ stliwrite, /* ioctl */ stliioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ stli_drvname, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c index 56c90d1..5d23958 100644 --- a/sys/i386/isa/joy.c +++ b/sys/i386/isa/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/i386/isa/labpc.c b/sys/i386/isa/labpc.c index a19b86a..54d7dca 100644 --- a/sys/i386/isa/labpc.c +++ b/sys/i386/isa/labpc.c @@ -37,6 +37,9 @@ * Written by: * Peter Dufault * dufault@hda.com + * + * $FreeBSD$ + * */ #include "labpc.h" @@ -289,19 +292,14 @@ static struct cdevsw labpc_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ labpcioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ labpcstrategy, /* name */ "labpc", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c index a5d64ef..66166b1 100644 --- a/sys/i386/isa/loran.c +++ b/sys/i386/isa/loran.c @@ -628,19 +628,14 @@ static struct cdevsw loran_cdevsw = { /* read */ loranread, /* write */ loranwrite, /* ioctl */ noioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "loran", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index 2125a62..f0ec9e7 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -514,19 +514,14 @@ static struct cdevsw matcd_cdevsw = { /* read */ physread, /* write */ nowrite, /* ioctl */ matcdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ matcdstrategy, /* name */ "matcd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index b49cd55..e4da168 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/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/i386/isa/mse.c b/sys/i386/isa/mse.c index f6d6c66..5f9f2c0 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/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/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 62875bf..7c913b2 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -136,19 +136,14 @@ static struct cdevsw pca_cdevsw = { /* read */ noread, /* write */ pcawrite, /* ioctl */ pcaioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ pcapoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "pca", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index 8e5c26d..601be1a 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -132,19 +132,14 @@ static struct cdevsw pc_cdevsw = { /* read */ pcread, /* write */ pcwrite, /* ioctl */ pcioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ pcmmap, /* strategy */ nostrategy, /* name */ "vt", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 238a052..91b735e 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/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/i386/isa/rp.c b/sys/i386/isa/rp.c index d788b57..5a4cceb 100644 --- a/sys/i386/isa/rp.c +++ b/sys/i386/isa/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/i386/isa/scd.c b/sys/i386/isa/scd.c index b76c2d6..a615f49 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/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/i386/isa/si.c b/sys/i386/isa/si.c index a1cde6e..79097ca 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/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/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c index 4e2062f..bf980fd 100644 --- a/sys/i386/isa/snd/sound.c +++ b/sys/i386/isa/snd/sound.c @@ -48,6 +48,8 @@ * device parameters, then call the board-specific routines if * available, or try to perform the task using the default code. * + * $FreeBSD$ + * */ #include <i386/isa/snd/sound.h> @@ -75,19 +77,14 @@ static struct cdevsw snd_cdevsw = { /* read */ sndread, /* write */ sndwrite, /* ioctl */ sndioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ sndselect, /* 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/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index 746ea9b..98656c8 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -24,7 +24,9 @@ * LIABILITY, OR TORT (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 <i386/isa/sound/sound_config.h> #if NSND > 0 /* from "snd.h" */ @@ -92,19 +94,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 */ driver_name, - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c index 3b64ff5..816ec1e 100644 --- a/sys/i386/isa/spigot.c +++ b/sys/i386/isa/spigot.c @@ -42,6 +42,8 @@ * * Version 1.7, December 1995. * + * $FreeBSD$ + * */ #include "spigot.h" @@ -101,19 +103,14 @@ static struct cdevsw spigot_cdevsw = { /* read */ spigot_read, /* write */ spigot_write, /* ioctl */ spigot_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ spigot_mmap, /* strategy */ nostrategy, /* name */ "spigot", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index 39d50c4..10cc4a1 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/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/i386/isa/stallion.c b/sys/i386/isa/stallion.c index 99cef03..76e9119 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -535,19 +535,14 @@ static struct cdevsw stl_cdevsw = { /* read */ stlread, /* write */ stlwrite, /* ioctl */ stlioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "stl", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c index 3556255..be85785 100644 --- a/sys/i386/isa/tw.c +++ b/sys/i386/isa/tw.c @@ -27,6 +27,9 @@ * LIABILITY, OR TORT (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 "tw.h" @@ -221,19 +224,14 @@ static struct cdevsw tw_cdevsw = { /* read */ twread, /* write */ twwrite, /* ioctl */ noioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ twpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "tw", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index ed85661..1e90fcb 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -242,19 +242,14 @@ static struct cdevsw wd_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ wdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ wdstrategy, /* name */ "wd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ wddump, /* psize */ wdsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c index e4b9ddc..a494a6c 100644 --- a/sys/i386/isa/wd_cd.c +++ b/sys/i386/isa/wd_cd.c @@ -62,19 +62,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 */ "wcd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c index 21fdb44..696e98e 100644 --- a/sys/i386/isa/wfd.c +++ b/sys/i386/isa/wfd.c @@ -63,19 +63,14 @@ static struct cdevsw wfd_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ wfdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ wfdstrategy, /* name */ "wfd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c index 4c0b912..d218325 100644 --- a/sys/i386/isa/wst.c +++ b/sys/i386/isa/wst.c @@ -57,19 +57,14 @@ static struct cdevsw wst_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ wstioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ wststrategy, /* name */ "wst", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index 735869c..f7fdebb 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -190,19 +190,14 @@ static struct cdevsw wt_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ wtioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ wtstrategy, /* name */ "wt", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c index 24c5f27..21d5d76 100644 --- a/sys/i4b/driver/i4b_ctl.c +++ b/sys/i4b/driver/i4b_ctl.c @@ -100,19 +100,14 @@ static struct cdevsw i4bctl_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ i4bctlioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ POLLFIELD, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "i4bctl", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #else diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c index 3852b5b..3c00673 100644 --- a/sys/i4b/driver/i4b_rbch.c +++ b/sys/i4b/driver/i4b_rbch.c @@ -172,19 +172,14 @@ static struct cdevsw i4brbch_cdevsw = { /* read */ i4brbchread, /* write */ i4brbchwrite, /* ioctl */ i4brbchioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ POLLFIELD, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "i4brbch", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #else diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c index 3d577c3..4c9bf84 100644 --- a/sys/i4b/driver/i4b_tel.c +++ b/sys/i4b/driver/i4b_tel.c @@ -189,19 +189,14 @@ static struct cdevsw i4btel_cdevsw = { /* read */ i4btelread, /* write */ i4btelwrite, /* ioctl */ i4btelioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ POLLFIELD, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "i4btel", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #else diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c index ad02f2b..d931fab 100644 --- a/sys/i4b/driver/i4b_trace.c +++ b/sys/i4b/driver/i4b_trace.c @@ -131,19 +131,14 @@ static struct cdevsw i4btrc_cdevsw = { /* read */ i4btrcread, /* write */ nowrite, /* ioctl */ i4btrcioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ POLLFIELD, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "i4btrc", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #else diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c index 19a2fba..f45897b 100644 --- a/sys/i4b/layer4/i4b_i4bdrv.c +++ b/sys/i4b/layer4/i4b_i4bdrv.c @@ -144,19 +144,14 @@ static struct cdevsw i4b_cdevsw = { /* read */ i4bread, /* write */ nowrite, /* ioctl */ i4bioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ POLLFIELD, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "i4b", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #else diff --git a/sys/i4b/tina-dd/i4b_tina_dd.c b/sys/i4b/tina-dd/i4b_tina_dd.c index f6d343f..5ec784c 100644 --- a/sys/i4b/tina-dd/i4b_tina_dd.c +++ b/sys/i4b/tina-dd/i4b_tina_dd.c @@ -102,19 +102,14 @@ static struct cdevsw tina_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ tinaioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ POLLFIELD, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "tina", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/isa/fd.c b/sys/isa/fd.c index f51161b..e63a75b 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.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/isa/joy.c b/sys/isa/joy.c index 56c90d1..5d23958 100644 --- a/sys/isa/joy.c +++ b/sys/isa/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/isa/psm.c b/sys/isa/psm.c index 6e861cc..747d2df 100644 --- a/sys/isa/psm.c +++ b/sys/isa/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/isa/sio.c b/sys/isa/sio.c index 28c54db..ace8592 100644 --- a/sys/isa/sio.c +++ b/sys/isa/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/isa/vga_isa.c b/sys/isa/vga_isa.c index 95cc1b1..885ef0d 100644 --- a/sys/isa/vga_isa.c +++ b/sys/isa/vga_isa.c @@ -96,19 +96,14 @@ static struct cdevsw isavga_cdevsw = { /* read */ isavga_read, /* write */ isavga_write, /* ioctl */ isavga_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ isavga_mmap, /* strategy */ nostrategy, /* name */ VGA_DRIVER_NAME, - /* parms */ noparms, /* maj */ -1, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index fa0b4df..e8ac386 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -78,19 +78,14 @@ static struct cdevsw fildesc_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ noioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "FD", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index b08a3f8..a6f03d0 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -69,19 +69,14 @@ static struct cdevsw log_cdevsw = { /* read */ logread, /* write */ nowrite, /* ioctl */ logioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ logpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "log", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c index e0298f7..6819fb3 100644 --- a/sys/kern/subr_xxx.c +++ b/sys/kern/subr_xxx.c @@ -133,31 +133,6 @@ noioctl(dev, cmd, data, flags, p) return (ENODEV); } -void -nostop(tp, rw) - struct tty *tp; - int rw; -{ - -} - -int -noreset(dev) - dev_t dev; -{ - - printf("noreset(%d,%d) called\n", major(dev), minor(dev)); - return (ENODEV); -} - -struct tty * -nodevtotty(dev) - dev_t dev; -{ - - return (NULL); -} - int nommap(dev, offset, nprot) dev_t dev; diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 88456be..e014e31 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -2434,3 +2434,11 @@ sysctl_kern_ttys SYSCTL_HANDLER_ARGS SYSCTL_PROC(_kern, OID_AUTO, ttys, CTLTYPE_OPAQUE|CTLFLAG_RD, 0, 0, sysctl_kern_ttys, "S,tty", "All struct ttys"); + +void +nottystop(tp, rw) + struct tty *tp; + int rw; +{ + return; +} diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index c59864f..53c292e 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -66,19 +66,14 @@ static struct cdevsw cn_cdevsw = { /* read */ cnread, /* write */ cnwrite, /* ioctl */ cnioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ cnpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "console", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 9531f7b..238fdad 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -80,19 +80,14 @@ static struct cdevsw pts_cdevsw = { /* read */ ptsread, /* write */ ptswrite, /* ioctl */ ptyioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "pts", - /* parms */ noparms, /* maj */ CDEV_MAJOR_S, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; @@ -103,19 +98,14 @@ static struct cdevsw ptc_cdevsw = { /* read */ ptcread, /* write */ ptcwrite, /* ioctl */ ptyioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ ptcpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ptc", - /* parms */ noparms, /* maj */ CDEV_MAJOR_C, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index e30b293..9105e26 100644 --- a/sys/kern/tty_snoop.c +++ b/sys/kern/tty_snoop.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/kern/tty_tty.c b/sys/kern/tty_tty.c index 1ee95bc..2d15c70 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -61,19 +61,14 @@ struct cdevsw ctty_cdevsw = { /* read */ cttyread, /* write */ cttywrite, /* ioctl */ cttyioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ cttypoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ctty", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 5c003f9..4a07946 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -243,8 +243,8 @@ spec_open(ap) struct tty *tp; tp = dev->si_tty; if (!tp->t_stop) { - printf("Warning:%s: no t_stop, using nostop\n", devtoname(dev)); - tp->t_stop = nostop; + printf("Warning:%s: no t_stop, using nottystop\n", devtoname(dev)); + tp->t_stop = nottystop; } } } diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 0e73b83..6876ab2 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -140,19 +140,14 @@ static struct cdevsw bpf_cdevsw = { /* read */ bpfread, /* write */ bpfwrite, /* ioctl */ bpfioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ bpfpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "bpf", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 7617968..ab71571 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -87,19 +87,14 @@ static struct cdevsw tun_cdevsw = { /* read */ tunread, /* write */ tunwrite, /* ioctl */ tunioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ tunpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "tun", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/netinet/mlf_ipl.c b/sys/netinet/mlf_ipl.c index 74d9ab0..2ec0c6b 100644 --- a/sys/netinet/mlf_ipl.c +++ b/sys/netinet/mlf_ipl.c @@ -161,19 +161,14 @@ static struct cdevsw ipl_cdevsw = { /* read */ iplread, /* write */ nowrite, /* ioctl */ iplioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "ipl", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #endif diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index bc5c9ba..45b9900 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -486,19 +486,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/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index cf2c47b..bcb97db 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -109,19 +109,14 @@ static struct cdevsw vga_cdevsw = { /* read */ gdcread, /* write */ gdcwrite, /* ioctl */ gdcioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ DRIVER_NAME, - /* parms */ noparms, /* maj */ -1, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c index 259d95c..c666990 100644 --- a/sys/pc98/cbus/olpt.c +++ b/sys/pc98/cbus/olpt.c @@ -305,19 +305,14 @@ static struct cdevsw lpt_cdevsw = { /* read */ noread, /* write */ lptwrite, /* ioctl */ lptioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "lpt", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index f34b034..f66b740 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -467,19 +467,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/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index bc5c9ba..45b9900 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -486,19 +486,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/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c index 23ce0f8..36806f2 100644 --- a/sys/pc98/pc98/mse.c +++ b/sys/pc98/pc98/mse.c @@ -85,19 +85,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/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c index 259d95c..c666990 100644 --- a/sys/pc98/pc98/olpt.c +++ b/sys/pc98/pc98/olpt.c @@ -305,19 +305,14 @@ static struct cdevsw lpt_cdevsw = { /* read */ noread, /* write */ lptwrite, /* ioctl */ lptioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "lpt", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c index cf2c47b..bcb97db 100644 --- a/sys/pc98/pc98/pc98gdc.c +++ b/sys/pc98/pc98/pc98gdc.c @@ -109,19 +109,14 @@ static struct cdevsw vga_cdevsw = { /* read */ gdcread, /* write */ gdcwrite, /* ioctl */ gdcioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ DRIVER_NAME, - /* parms */ noparms, /* maj */ -1, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c index e6181d9..d56a441 100644 --- a/sys/pc98/pc98/pcaudio.c +++ b/sys/pc98/pc98/pcaudio.c @@ -142,19 +142,14 @@ static struct cdevsw pca_cdevsw = { /* read */ noread, /* write */ pcawrite, /* ioctl */ pcaioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ pcapoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "pca", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index f34b034..f66b740 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -467,19 +467,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/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c index 1d13188..fbea735 100644 --- a/sys/pc98/pc98/spkr.c +++ b/sys/pc98/pc98/spkr.c @@ -43,19 +43,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/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c index f479689..1e6f4e6 100644 --- a/sys/pc98/pc98/syscons.c +++ b/sys/pc98/pc98/syscons.c @@ -214,19 +214,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 }; diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 596857e..8357cc7 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -264,19 +264,14 @@ static struct cdevsw wd_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ wdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ wdstrategy, /* name */ "wd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ wddump, /* psize */ wdsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c index e4b9ddc..a494a6c 100644 --- a/sys/pc98/pc98/wd_cd.c +++ b/sys/pc98/pc98/wd_cd.c @@ -62,19 +62,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 */ "wcd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c index 21fdb44..696e98e 100644 --- a/sys/pc98/pc98/wfd.c +++ b/sys/pc98/pc98/wfd.c @@ -63,19 +63,14 @@ static struct cdevsw wfd_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ wfdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ wfdstrategy, /* name */ "wfd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c index 4c0b912..d218325 100644 --- a/sys/pc98/pc98/wst.c +++ b/sys/pc98/pc98/wst.c @@ -57,19 +57,14 @@ static struct cdevsw wst_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ wstioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ wststrategy, /* name */ "wst", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 8f10b99..ca3f353 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -146,19 +146,14 @@ static struct cdevsw crd_cdevsw = { /* read */ crdread, /* write */ crdwrite, /* ioctl */ crdioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ crdpoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "crd", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index f306cc2..de0deea 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -226,19 +226,14 @@ static struct cdevsw meteor_cdevsw = { /* read */ meteor_read, /* write */ meteor_write, /* ioctl */ meteor_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ meteor_mmap, /* strategy */ nostrategy, /* name */ "meteor", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; #endif diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 3792940..a8502bc 100644 --- a/sys/pci/pci.c +++ b/sys/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/pci/xrpu.c b/sys/pci/xrpu.c index 1b56e6b..79d84dc 100644 --- a/sys/pci/xrpu.c +++ b/sys/pci/xrpu.c @@ -50,19 +50,14 @@ static struct cdevsw xrpu_cdevsw = { /* read */ noread, /* write */ nowrite, /* ioctl */ xrpu_ioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ xrpu_mmap, /* strategy */ nostrategy, /* name */ "xrpu", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ -1 }; diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 6cdc728..9da88a1 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -112,9 +112,6 @@ typedef int d_psize_t __P((dev_t dev)); typedef int d_read_t __P((dev_t dev, struct uio *uio, int ioflag)); typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag)); -typedef void d_stop_t __P((struct tty *tp, int rw)); -typedef int d_reset_t __P((dev_t dev)); -typedef struct tty *d_devtotty_t __P((dev_t dev)); typedef int d_poll_t __P((dev_t dev, int events, struct proc *p)); typedef int d_mmap_t __P((dev_t dev, vm_offset_t offset, int nprot)); @@ -176,12 +173,10 @@ struct cdevsw { d_mmap_t *d_mmap; d_strategy_t *d_strategy; const char *d_name; /* base device name, e.g. 'vn' */ - d_parms_t *d_bogoparms; /* XXX not used */ int d_maj; d_dump_t *d_dump; d_psize_t *d_psize; u_int d_flags; - int d_bogomaxio; /* XXX not used */ int d_bmaj; }; @@ -229,12 +224,8 @@ d_close_t noclose; d_read_t noread; d_write_t nowrite; d_ioctl_t noioctl; -d_stop_t nostop; -d_reset_t noreset; -d_devtotty_t nodevtotty; d_mmap_t nommap; #define nostrategy ((d_strategy_t *)NULL) -#define noparms ((d_parms_t *)NULL) #define nopoll seltrue d_dump_t nodump; diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index 6cdc728..9da88a1 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -112,9 +112,6 @@ typedef int d_psize_t __P((dev_t dev)); typedef int d_read_t __P((dev_t dev, struct uio *uio, int ioflag)); typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag)); -typedef void d_stop_t __P((struct tty *tp, int rw)); -typedef int d_reset_t __P((dev_t dev)); -typedef struct tty *d_devtotty_t __P((dev_t dev)); typedef int d_poll_t __P((dev_t dev, int events, struct proc *p)); typedef int d_mmap_t __P((dev_t dev, vm_offset_t offset, int nprot)); @@ -176,12 +173,10 @@ struct cdevsw { d_mmap_t *d_mmap; d_strategy_t *d_strategy; const char *d_name; /* base device name, e.g. 'vn' */ - d_parms_t *d_bogoparms; /* XXX not used */ int d_maj; d_dump_t *d_dump; d_psize_t *d_psize; u_int d_flags; - int d_bogomaxio; /* XXX not used */ int d_bmaj; }; @@ -229,12 +224,8 @@ d_close_t noclose; d_read_t noread; d_write_t nowrite; d_ioctl_t noioctl; -d_stop_t nostop; -d_reset_t noreset; -d_devtotty_t nodevtotty; d_mmap_t nommap; #define nostrategy ((d_strategy_t *)NULL) -#define noparms ((d_parms_t *)NULL) #define nopoll seltrue d_dump_t nodump; diff --git a/sys/sys/tty.h b/sys/sys/tty.h index 74754d57..083ea2a 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -234,6 +234,7 @@ void clist_free_cblocks __P((struct clist *q)); int getc __P((struct clist *q)); void ndflush __P((struct clist *q, int cc)); int ndqb __P((struct clist *q, int flag)); +void nottystop __P((struct tty*, int rw)); char *nextc __P((struct clist *q, char *cp, int *c)); int putc __P((int c, struct clist *q)); int q_to_b __P((struct clist *q, char *cp, int cc)); diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index c17fbd4..9188837 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -85,19 +85,14 @@ static struct cdevsw mfs_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ noioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ nostrategy, /* name */ "MFS", - /* parms */ noparms, /* maj */ 253, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* maxio */ 0, /* bmaj */ 253, }; diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 8a178bd..f3c0e86 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -74,19 +74,14 @@ static struct cdevsw sw_cdevsw = { /* read */ physread, /* write */ physwrite, /* ioctl */ noioctl, - /* stop */ nostop, - /* reset */ noreset, - /* devtotty */ nodevtotty, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ swstrategy, /* name */ "sw", - /* parms */ noparms, /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* maxio */ 0, /* bmaj */ BDEV_MAJOR }; |
