diff options
Diffstat (limited to 'sys')
136 files changed, 2853 insertions, 941 deletions
diff --git a/sys/alpha/alpha/cons.c b/sys/alpha/alpha/cons.c index 3af7783a7e3dc..1cb7ac2a30ea4 100644 --- a/sys/alpha/alpha/cons.c +++ b/sys/alpha/alpha/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.6 1999/05/08 06:37:51 phk Exp $ + * $Id: cons.c,v 1.7 1999/05/15 18:14:03 dfr Exp $ */ #include "opt_devfs.h" @@ -84,10 +84,27 @@ static d_ioctl_t cnioctl; static d_poll_t cnpoll; #define CDEV_MAJOR 0 -static struct cdevsw cn_cdevsw = - { cnopen, cnclose, cnread, cnwrite, /*0*/ - cnioctl, nullstop, nullreset, nodevtotty,/* console */ - cnpoll, nommap, NULL, "console", NULL, -1 }; +static struct cdevsw cn_cdevsw = { + /* open */ cnopen, + /* close */ cnclose, + /* 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 */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; static dev_t cn_dev_t; /* seems to be never really used */ static udev_t cn_udev_t; diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c index 459075215728e..c266810ad1e58 100644 --- a/sys/alpha/alpha/mem.c +++ b/sys/alpha/alpha/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.7 1999/05/25 19:32:53 dt Exp $ + * $Id: mem.c,v 1.8 1999/05/29 19:47:51 gallatin Exp $ */ /* @@ -82,10 +82,27 @@ static d_mmap_t memmmap; static d_poll_t mmpoll; #define CDEV_MAJOR 2 -static struct cdevsw mem_cdevsw = - { mmopen, mmclose, mmrw, mmrw, /*2*/ - mmioctl, nullstop, nullreset, nodevtotty,/* memory */ - mmpoll, memmmap, NULL, "mem", NULL, -1 }; +static struct cdevsw mem_cdevsw = { + /* open */ mmopen, + /* close */ mmclose, + /* 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 */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; #ifdef DEVFS static void *mem_devfs_token; diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c index 5570c7e2efcca..f3dbde81ad6fe 100644 --- a/sys/alpha/alpha/promcons.c +++ b/sys/alpha/alpha/promcons.c @@ -1,4 +1,4 @@ -/* $Id: promcons.c,v 1.6 1999/05/07 10:09:28 phk Exp $ */ +/* $Id: promcons.c,v 1.7 1999/05/09 08:57:47 phk Exp $ */ /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */ /* @@ -69,10 +69,25 @@ static d_devtotty_t promdevtotty; #define CDEV_MAJOR 97 static struct cdevsw prom_cdevsw = { - promopen, promclose, promread, promwrite, - promioctl, promstop, noreset, promdevtotty, - ttpoll, nommap, NULL, "prom", - NULL, -1, + /* open */ promopen, + /* close */ promclose, + /* read */ promread, + /* write */ promwrite, + /* ioctl */ promioctl, + /* stop */ promstop, + /* reset */ noreset, + /* devtotty */ promdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "prom", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; static struct tty prom_tty[1]; diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c index 0c1d97ee2628f..10a5a496cc18b 100644 --- a/sys/alpha/tlsb/zs_tlsb.c +++ b/sys/alpha/tlsb/zs_tlsb.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: zs_tlsb.c,v 1.11 1999/05/09 13:00:30 phk Exp $ + * $Id: zs_tlsb.c,v 1.12 1999/05/10 14:01:35 dfr Exp $ */ /* * This driver is a hopeless hack to get the SimOS console working. A real @@ -72,10 +72,25 @@ static d_devtotty_t zsdevtotty; #define CDEV_MAJOR 98 static struct cdevsw zs_cdevsw = { - zsopen, zsclose, zsread, zswrite, - zsioctl, zsstop, noreset, zsdevtotty, - ttpoll, nommap, NULL, "zs", - NULL, -1, + /* open */ zsopen, + /* close */ zsclose, + /* read */ zsread, + /* write */ zswrite, + /* ioctl */ zsioctl, + /* stop */ zsstop, + /* reset */ noreset, + /* devtotty */ zsdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "zs", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; static void zsstart __P((struct tty *)); diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index 04cf9264829dd..20a7820fd9a82 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.60 1999/05/08 17:48:21 peter Exp $ + * $Id: mem.c,v 1.61 1999/05/11 19:54:06 phk Exp $ */ /* @@ -87,10 +87,27 @@ static d_mmap_t memmmap; static d_poll_t mmpoll; #define CDEV_MAJOR 2 -static struct cdevsw mem_cdevsw = - { mmopen, mmclose, mmrw, mmrw, /*2*/ - mmioctl, nullstop, nullreset, nodevtotty,/* memory */ - mmpoll, memmmap, NULL, "mem", NULL, -1 }; +static struct cdevsw mem_cdevsw = { + /* open */ mmopen, + /* close */ mmclose, + /* 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 */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; static struct random_softc random_softc[16]; static caddr_t zbuf; diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 3fc748d89f041..2ae2b3f3b6e38 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cam_xpt.c,v 1.60 1999/05/23 18:57:29 gibbs Exp $ + * $Id: cam_xpt.c,v 1.61 1999/05/25 20:17:29 gibbs Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -553,27 +553,26 @@ static d_open_t xptopen; static d_close_t xptclose; static d_ioctl_t xptioctl; -static struct cdevsw xpt_cdevsw = -{ - /*d_open*/ xptopen, - /*d_close*/ xptclose, - /*d_read*/ noread, - /*d_write*/ nowrite, - /*d_ioctl*/ xptioctl, - /*d_stop*/ nostop, - /*d_reset*/ noreset, - /*d_devtotty*/ nodevtotty, - /*d_poll*/ NULL, - /*d_mmap*/ nommap, - /*d_strategy*/ nostrategy, - /*d_name*/ "xpt", - /*d_spare*/ NULL, - /*d_maj*/ -1, - /*d_dump*/ nodump, - /*d_psize*/ nopsize, - /*d_flags*/ 0, - /*d_maxio*/ 0, - /*b_maj*/ -1 +static struct cdevsw xpt_cdevsw = { + /* open */ xptopen, + /* close */ xptclose, + /* 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 }; static struct intr_config_hook *xpt_config_hook; diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index d7d96cce8af29..730d97fafec4e 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_cd.c,v 1.20 1999/05/09 01:25:24 ken Exp $ + * $Id: scsi_cd.c,v 1.21 1999/05/22 22:00:18 gibbs Exp $ */ /* * Portions of this driver taken from the original FreeBSD cd driver. @@ -243,27 +243,26 @@ DATA_SET(periphdriver_set, cddriver); #ifndef D_DISK #define D_DISK 0 #endif -static struct cdevsw cd_cdevsw = -{ - /*d_open*/ cdopen, - /*d_close*/ cdclose, - /*d_read*/ physread, - /*d_write*/ nowrite, - /*d_ioctl*/ cdioctl, - /*d_stop*/ nostop, - /*d_reset*/ noreset, - /*d_devtotty*/ nodevtotty, - /*d_poll*/ seltrue, - /*d_mmap*/ nommap, - /*d_strategy*/ cdstrategy, - /*d_name*/ "cd", - /*d_spare*/ NULL, - /*d_maj*/ -1, - /*d_dump*/ nodump, - /*d_psize*/ nopsize, - /*d_flags*/ D_DISK, - /*d_maxio*/ 0, - /*b_maj*/ -1 +static struct cdevsw cd_cdevsw = { + /* open */ cdopen, + /* close */ cdclose, + /* 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 }; static struct extend_array *cdperiphs; diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c index 3e5ec380c30db..6fd7aeef395b2 100644 --- a/sys/cam/scsi/scsi_ch.c +++ b/sys/cam/scsi/scsi_ch.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_ch.c,v 1.11 1999/05/09 01:25:26 ken Exp $ + * $Id: scsi_ch.c,v 1.12 1999/05/22 22:00:19 gibbs Exp $ */ /* * Derived from the NetBSD SCSI changer driver. @@ -214,27 +214,26 @@ static struct periph_driver chdriver = DATA_SET(periphdriver_set, chdriver); -static struct cdevsw ch_cdevsw = -{ - /*d_open*/ chopen, - /*d_close*/ chclose, - /*d_read*/ noread, - /*d_write*/ nowrite, - /*d_ioctl*/ chioctl, - /*d_stop*/ nostop, - /*d_reset*/ noreset, - /*d_devtotty*/ nodevtotty, - /*d_poll*/ seltrue, - /*d_mmap*/ nommap, - /*d_strategy*/ nostrategy, - /*d_name*/ "ch", - /*d_spare*/ NULL, - /*d_maj*/ -1, - /*d_dump*/ nodump, - /*d_psize*/ nopsize, - /*d_flags*/ 0, - /*d_maxio*/ 0, - /*b_maj*/ -1 +static struct cdevsw ch_cdevsw = { + /* open */ chopen, + /* close */ chclose, + /* 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 }; static struct extend_array *chperiphs; diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 4a5e000c12b8d..598a0548600ed 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_da.c,v 1.24 1999/05/09 01:25:28 ken Exp $ + * $Id: scsi_da.c,v 1.25 1999/05/22 22:00:20 gibbs Exp $ */ #include "opt_hw_wdog.h" @@ -236,27 +236,26 @@ DATA_SET(periphdriver_set, dadriver); #define D_DISK 0 #endif -static struct cdevsw da_cdevsw = -{ - /*d_open*/ daopen, - /*d_close*/ daclose, - /*d_read*/ physread, - /*d_write*/ physwrite, - /*d_ioctl*/ daioctl, - /*d_stop*/ nostop, - /*d_reset*/ noreset, - /*d_devtotty*/ nodevtotty, - /*d_poll*/ seltrue, - /*d_mmap*/ nommap, - /*d_strategy*/ dastrategy, - /*d_name*/ "da", - /*d_spare*/ NULL, - /*d_maj*/ -1, - /*d_dump*/ dadump, - /*d_psize*/ dasize, - /*d_flags*/ D_DISK, - /*d_maxio*/ 0, - /*b_maj*/ -1 +static struct cdevsw da_cdevsw = { + /* open */ daopen, + /* close */ daclose, + /* 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 }; static SLIST_HEAD(,da_softc) softc_list; diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index 37cdd555c402d..a350c8e79e6a5 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_pass.c,v 1.9 1999/05/09 01:25:30 ken Exp $ + * $Id: scsi_pass.c,v 1.10 1999/05/22 22:00:21 gibbs Exp $ */ #include <sys/param.h> @@ -121,27 +121,26 @@ static struct periph_driver passdriver = DATA_SET(periphdriver_set, passdriver); -static struct cdevsw pass_cdevsw = -{ - /*d_open*/ passopen, - /*d_close*/ passclose, - /*d_read*/ physread, - /*d_write*/ physwrite, - /*d_ioctl*/ passioctl, - /*d_stop*/ nostop, - /*d_reset*/ noreset, - /*d_devtotty*/ nodevtotty, - /*d_poll*/ seltrue, - /*d_mmap*/ nommap, - /*d_strategy*/ passstrategy, - /*d_name*/ "pass", - /*d_spare*/ NULL, - /*d_maj*/ -1, - /*d_dump*/ nodump, - /*d_psize*/ nopsize, - /*d_flags*/ 0, - /*d_maxio*/ 0, - /*b_maj*/ -1 +static struct cdevsw pass_cdevsw = { + /* open */ passopen, + /* close */ passclose, + /* 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 }; static struct extend_array *passperiphs; diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c index f6bba3bdac01a..30415912850c8 100644 --- a/sys/cam/scsi/scsi_pt.c +++ b/sys/cam/scsi/scsi_pt.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_pt.c,v 1.7 1999/05/09 01:25:32 ken Exp $ + * $Id: scsi_pt.c,v 1.8 1999/05/22 22:00:22 gibbs Exp $ */ #include <sys/param.h> @@ -112,27 +112,26 @@ DATA_SET(periphdriver_set, ptdriver); #define PT_CDEV_MAJOR 61 -static struct cdevsw pt_cdevsw = -{ - /*d_open*/ ptopen, - /*d_close*/ ptclose, - /*d_read*/ physread, - /*d_write*/ physwrite, - /*d_ioctl*/ noioctl, - /*d_stop*/ nostop, - /*d_reset*/ noreset, - /*d_devtotty*/ nodevtotty, - /*d_poll*/ seltrue, - /*d_mmap*/ nommap, - /*d_strategy*/ ptstrategy, - /*d_name*/ "pt", - /*d_spare*/ NULL, - /*d_maj*/ -1, - /*d_dump*/ nodump, - /*d_psize*/ nopsize, - /*d_flags*/ 0, - /*d_maxio*/ 0, - /*b_maj*/ -1 +static struct cdevsw pt_cdevsw = { + /* open */ ptopen, + /* close */ ptclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ noioctl, + /* 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 }; static struct extend_array *ptperiphs; diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index 40acfc165232f..1761055879527 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -1,5 +1,5 @@ /* - * $Id: scsi_sa.c,v 1.25 1999/05/22 22:00:23 gibbs Exp $ + * $Id: scsi_sa.c,v 1.26 1999/05/25 23:10:54 mjacob Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -340,27 +340,26 @@ DATA_SET(periphdriver_set, sadriver); #define SA_CDEV_MAJOR 14 #define SA_BDEV_MAJOR 5 -static struct cdevsw sa_cdevsw = -{ - /*d_open*/ saopen, - /*d_close*/ saclose, - /*d_read*/ physread, - /*d_write*/ physwrite, - /*d_ioctl*/ saioctl, - /*d_stop*/ nostop, - /*d_reset*/ noreset, - /*d_devtotty*/ nodevtotty, - /*d_poll*/ seltrue, - /*d_mmap*/ nommap, - /*d_strategy*/ sastrategy, - /*d_name*/ "sa", - /*d_spare*/ NULL, - /*d_maj*/ -1, - /*d_dump*/ nodump, - /*d_psize*/ nopsize, - /*d_flags*/ D_TAPE, - /*d_maxio*/ 0, - /*b_maj*/ -1 +static struct cdevsw sa_cdevsw = { + /* open */ saopen, + /* close */ saclose, + /* 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 */ SA_BDEV_MAJOR }; static struct extend_array *saperiphs; diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c index 191a99188e6f6..302e23fd9c920 100644 --- a/sys/cam/scsi/scsi_target.c +++ b/sys/cam/scsi/scsi_target.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_target.c,v 1.11 1999/05/07 07:03:03 phk Exp $ + * $Id: scsi_target.c,v 1.12 1999/05/22 22:00:24 gibbs Exp $ */ #include <stddef.h> /* For offsetof */ @@ -136,25 +136,25 @@ static d_strategy_t targstrategy; #define TARG_CDEV_MAJOR 65 static struct cdevsw targ_cdevsw = { - /*d_open*/ targopen, - /*d_close*/ targclose, - /*d_read*/ targread, - /*d_write*/ targwrite, - /*d_ioctl*/ targioctl, - /*d_stop*/ nostop, - /*d_reset*/ noreset, - /*d_devtotty*/ nodevtotty, - /*d_poll*/ targpoll, - /*d_mmap*/ nommap, - /*d_strategy*/ targstrategy, - /*d_name*/ "targ", - /*d_spare*/ NULL, - /*d_maj*/ -1, - /*d_dump*/ nodump, - /*d_psize*/ nopsize, - /*d_flags*/ 0, - /*d_maxio*/ 0, - /*b_maj*/ -1 + /* open */ targopen, + /* close */ targclose, + /* 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 }; static int targsendccb(struct cam_periph *periph, union ccb *ccb, diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c index 703708c636703..49bba22bc7b80 100644 --- a/sys/coda/coda_fbsd.c +++ b/sys/coda/coda_fbsd.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_fbsd.c,v 1.12 1999/01/27 20:09:17 dillon Exp $ + * $Id: coda_fbsd.c,v 1.13 1999/01/28 00:57:46 dillon Exp $ * */ @@ -73,11 +73,26 @@ static void *coda_devfs_token[NVCODA]; #define VC_DEV_NO 93 -static struct cdevsw codadevsw = -{ - vc_nb_open, vc_nb_close, vc_nb_read, vc_nb_write, /*93*/ - vc_nb_ioctl, nostop, nullreset, nodevtotty, - vc_nb_poll, nommap, NULL, "Coda", NULL, -1 +static struct cdevsw codadevsw = { + /* open */ vc_nb_open, + /* close */ vc_nb_close, + /* 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 }; int vcdebug = 1; diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 0f00d1cf45e1b..b46f77096d28c 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ata-disk.c,v 1.10 1999/05/11 19:53:58 phk Exp $ + * $Id: ata-disk.c,v 1.11 1999/05/17 15:58:45 sos Exp $ */ #include "ata.h" @@ -62,16 +62,31 @@ static d_psize_t adpsize; #define BDEV_MAJOR 30 #define CDEV_MAJOR 116 -static struct cdevsw ad_cdevsw = { - adopen, adclose, physread, physwrite, - adioctl, nostop, nullreset, nodevtotty, #ifdef NOTYET /* the boot code needs to be fixed to boot arbitrary devices */ - seltrue, nommap, adstrategy, "ad", +#define DRIVER_NAME "ad" #else - seltrue, nommap, adstrategy, "wd", +#define DRIVER_NAME "wd" #endif - NULL, -1, nodump, adpsize, - D_DISK, 0, -1 +static struct cdevsw ad_cdevsw = { + /* open */ adopen, + /* close */ adclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ adioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ adstrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ adpsize, + /* flags */ D_DISK, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR, }; /* misc defines */ diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index d779c5ee653c4..aaec64429ed61 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-cd.c,v 1.7 1999/05/07 07:03:13 phk Exp $ + * $Id: atapi-cd.c,v 1.8 1999/05/17 15:58:46 sos Exp $ */ #include "ata.h" @@ -63,11 +63,25 @@ static d_strategy_t acdstrategy; #define BDEV_MAJOR 31 #define CDEV_MAJOR 117 static struct cdevsw acd_cdevsw = { - acdopen, acdclose, physread, physwrite, - acdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, acdstrategy, "acd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 + /* open */ acdopen, + /* close */ acdclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ acdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ acdstrategy, + /* name */ "acd", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_DISK, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR }; #define NUNIT 16 /* Max # of devices */ diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index e6bad6076d087..d63a03912ba8a 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-fd.c,v 1.7 1999/05/17 15:58:46 sos Exp $ + * $Id: atapi-fd.c,v 1.8 1999/05/20 09:12:05 sos Exp $ */ #include "ata.h" @@ -65,11 +65,25 @@ static d_strategy_t afdstrategy; #define CDEV_MAJOR 118 static struct cdevsw afd_cdevsw = { - afdopen, afdclose, physread, physwrite, - afdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, afdstrategy, "afd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 + /* open */ afdopen, + /* close */ afdclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ afdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ afdstrategy, + /* name */ "afd", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_DISK, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR, }; #define NUNIT 8 diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index 43edafa70eaba..7699d899150a6 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-tape.c,v 1.7 1999/05/07 07:03:15 phk Exp $ + * $Id: atapi-tape.c,v 1.8 1999/05/17 15:58:47 sos Exp $ */ #include "ata.h" @@ -61,11 +61,25 @@ static d_strategy_t aststrategy; #define CDEV_MAJOR 119 static struct cdevsw ast_cdevsw = { - astopen, astclose, physread, physwrite, - astioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, aststrategy, "ast", - NULL, -1, nodump, nopsize, - D_TAPE, 0, -1 + /* open */ astopen, + /* close */ astclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ astioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ aststrategy, + /* name */ "ast", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TAPE, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR }; static u_int32_t ast_total = 0; diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index ecbac638b98ed..ea828f0f0eb0f 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atkbd.c,v 1.9 1999/05/18 11:05:58 yokota Exp $ + * $Id: atkbd.c,v 1.10 1999/05/20 09:49:33 yokota Exp $ */ #include "atkbd.h" @@ -64,11 +64,26 @@ static d_read_t atkbdread; static d_ioctl_t atkbdioctl; static d_poll_t atkbdpoll; -static struct cdevsw atkbd_cdevsw = { - atkbdopen, atkbdclose, atkbdread, nowrite, - atkbdioctl, nostop, nullreset, nodevtotty, - atkbdpoll, nommap, NULL, ATKBD_DRIVER_NAME, - NULL, -1, +static struct cdevsw atkbd_cdevsw = { + /* open */ atkbdopen, + /* close */ atkbdclose, + /* read */ atkbdread, + /* write */ nowrite, + /* ioctl */ atkbdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ atkbdpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ ATKBD_DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* KBD_INSTALL_CDEV */ diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index a520b65797afc..1d1589c7bbd0f 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.8 1999/05/09 04:58:35 yokota Exp $ + * $Id: psm.c,v 1.9 1999/05/09 13:00:43 phk Exp $ */ /* @@ -315,10 +315,26 @@ static driver_t psm_driver = { #define CDEV_MAJOR 21 -static struct cdevsw psm_cdevsw = { - psmopen, psmclose, psmread, nowrite, /* 21 */ - psmioctl, nostop, nullreset, nodevtotty, - psmpoll, nommap, NULL, "psm", NULL, -1 +static struct cdevsw psm_cdevsw = { + /* open */ psmopen, + /* close */ psmclose, + /* 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 }; /* debug message level */ diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index 67b2eb2e1f882..70d3367dfa01a 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $Id: brooktree848.c,v 1.80 1999/05/23 21:40:51 roger Exp $ */ +/* $Id: brooktree848.c,v 1.81 1999/05/25 12:43:40 roger Exp $ */ /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and Jim Lowe's driver for the Matrox Meteor PCI card . The @@ -600,12 +600,26 @@ static d_ioctl_t bktr_ioctl; static d_mmap_t bktr_mmap; #define CDEV_MAJOR 92 -static struct cdevsw bktr_cdevsw = -{ - bktr_open, bktr_close, bktr_read, bktr_write, - bktr_ioctl, nostop, nullreset, nodevtotty, - seltrue, bktr_mmap, NULL, "bktr", - NULL, -1 +static struct cdevsw bktr_cdevsw = { + /* open */ bktr_open, + /* close */ bktr_close, + /* read */ bktr_read, + /* write */ bktr_write, + /* ioctl */ bktr_ioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ bktr_mmap, + /* strategy */ nostrategy, + /* name */ "bktr", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* __FreeBSD__ */ diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 1ff7fd72922e9..2f26794a25cd7 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -1,4 +1,4 @@ -/* $Id: ccd.c,v 1.46 1999/05/07 10:09:42 phk Exp $ */ +/* $Id: ccd.c,v 1.47 1999/05/11 19:54:00 phk Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -174,11 +174,26 @@ static d_psize_t ccdsize; #define BDEV_MAJOR 21 static struct cdevsw ccd_cdevsw = { - ccdopen, ccdclose, physread, physwrite, - ccdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, ccdstrategy, "ccd", - NULL, -1, ccddump, ccdsize, - D_DISK, 0, -1 }; + /* open */ ccdopen, + /* close */ ccdclose, + /* 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 +}; /* called during module initialization */ static void ccdattach __P((void)); diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 93e8200496178..70d0466d7923e 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.87 1999/04/27 11:14:54 phk Exp $ + * $Id: cy.c,v 1.88 1999/05/28 13:23:21 bde Exp $ */ #include "opt_compat.h" @@ -388,12 +388,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 48 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static int comconsole = -1; diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 93e8200496178..70d0466d7923e 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.87 1999/04/27 11:14:54 phk Exp $ + * $Id: cy.c,v 1.88 1999/05/28 13:23:21 bde Exp $ */ #include "opt_compat.h" @@ -388,12 +388,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 48 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static int comconsole = -1; diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index e9a044bee2269..b39c89df7206b 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.47 1999/05/02 21:39:52 peter Exp $ + * dgb.c $Id: dgb.c,v 1.48 1999/05/08 07:02:24 phk Exp $ * * Digiboard driver. * @@ -224,12 +224,26 @@ static d_stop_t dgbstop; static d_devtotty_t dgbdevtotty; #define CDEV_MAJOR 58 -static struct cdevsw dgb_cdevsw = { - dgbopen, dgbclose, dgbread, dgbwrite, - dgbioctl, dgbstop, noreset, dgbdevtotty, - ttpoll, nommap, NULL, "dgb", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw dgb_cdevsw = { + /* open */ dgbopen, + /* close */ dgbclose, + /* read */ dgbread, + /* write */ dgbwrite, + /* ioctl */ dgbioctl, + /* stop */ dgbstop, + /* reset */ noreset, + /* devtotty */ dgbdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "dgb", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static speed_t dgbdefaultrate = TTYDEF_SPEED; diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c index 291e520c41927..5f3ff63fcd979 100644 --- a/sys/dev/dgb/dgm.c +++ b/sys/dev/dgb/dgm.c @@ -1,5 +1,5 @@ /*- - * $Id: dgm.c,v 1.12 1999/05/03 09:32:31 brian Exp $ + * $Id: dgm.c,v 1.13 1999/05/08 07:02:25 phk Exp $ * * This driver and the associated header files support the ISA PC/Xem * Digiboards. Its evolutionary roots are described below. @@ -228,12 +228,26 @@ static d_stop_t dgmstop; static d_devtotty_t dgmdevtotty; #define CDEV_MAJOR 101 -static struct cdevsw dgm_cdevsw = { - dgmopen, dgmclose, dgmread, dgmwrite, - dgmioctl, dgmstop, noreset, dgmdevtotty, - ttpoll, nommap, NULL, "dgm", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw dgm_cdevsw = { + /* open */ dgmopen, + /* close */ dgmclose, + /* read */ dgmread, + /* write */ dgmwrite, + /* ioctl */ dgmioctl, + /* stop */ dgmstop, + /* reset */ noreset, + /* devtotty */ dgmdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "dgm", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static speed_t dgmdefaultrate = TTYDEF_SPEED; diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c index d0a33ced2bf9f..0f9eff8cb549f 100644 --- a/sys/dev/dpt/dpt_control.c +++ b/sys/dev/dpt/dpt_control.c @@ -36,7 +36,7 @@ * future. */ -#ident "$Id: dpt_control.c,v 1.11 1999/05/11 11:03:18 jkh Exp $" +#ident "$Id: dpt_control.c,v 1.12 1999/05/13 05:24:53 jkh Exp $" #include "opt_dpt.h" @@ -91,11 +91,27 @@ static dpt_sig_t dpt_sig = { #define CDEV_MAJOR DPT_CDEV_MAJOR /* Normally, this is a static structure. But we need it in pci/dpt_pci.c */ -struct cdevsw dpt_cdevsw = { - dpt_open, dpt_close, dpt_read, dpt_write, - dpt_ioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, NULL, "dpt", -NULL, -1}; +static struct cdevsw dpt_cdevsw = { + /* open */ dpt_open, + /* close */ dpt_close, + /* 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 +}; static struct buf *dpt_inbuf[DPT_MAX_ADAPTERS]; static char dpt_rw_command[DPT_MAX_ADAPTERS][DPT_RW_CMD_LEN + 1]; diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 99d15f852a373..0b694b80fc71a 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: fb.c,v 1.2 1999/01/12 10:35:50 yokota Exp $ + * $Id: fb.c,v 1.3 1999/01/19 11:31:10 yokota Exp $ */ #include "fb.h" @@ -286,10 +286,25 @@ static d_mmap_t fbmmap; #define CDEV_MAJOR 141 /* XXX */ static struct cdevsw fb_cdevsw = { - fbopen, fbclose, noread, nowrite, /* ??? */ - fbioctl, nostop, nullreset, nodevtotty, - seltrue, fbmmap, NULL, DRIVER_NAME, - NULL, -1, nodump, nopsize, + /* open */ fbopen, + /* close */ fbclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ fbioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ fbmmap, + /* strategy */ nostrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; static void diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index cc51f9338364e..cd7001be81516 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.143 1999/05/11 04:58:30 bde Exp $ + * $Id: fd.c,v 1.144 1999/05/30 11:10:54 dfr Exp $ * */ @@ -370,16 +370,31 @@ static d_close_t fdclose; static d_ioctl_t fdioctl; static d_strategy_t fdstrategy; -static struct cdevsw fd_cdevsw = { - Fdopen, fdclose, physread, physwrite, - fdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, fdstrategy, "fd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 -}; #define CDEV_MAJOR 9 #define BDEV_MAJOR 2 +static struct cdevsw fd_cdevsw = { + /* open */ Fdopen, + /* close */ fdclose, + /* 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 +}; + static int fdc_err(struct fdc_data *fdc, const char *s) { diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c index a6cbe10c2a314..3921475ed7ee8 100644 --- a/sys/dev/hfa/fore_load.c +++ b/sys/dev/hfa/fore_load.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: fore_load.c,v 1.7 1999/05/09 17:07:30 peter Exp $ + * @(#) $Id: fore_load.c,v 1.8 1999/05/10 22:53:45 mks Exp $ * */ @@ -38,7 +38,7 @@ #include <dev/hfa/fore_include.h> #ifndef lint -__RCSID("@(#) $Id: fore_load.c,v 1.7 1999/05/09 17:07:30 peter Exp $"); +__RCSID("@(#) $Id: fore_load.c,v 1.8 1999/05/10 22:53:45 mks Exp $"); #endif @@ -1522,18 +1522,26 @@ fore_mod(cmd, vdp, vdi, vds) /* * Driver entry points */ -static struct cdevsw fore_cdev = { - (d_open_t *)enodev, /* open */ - (d_close_t *)enodev, /* close */ - NULL, /* read */ - NULL, /* write */ - NULL, /* ioctl */ - NULL, /* stop */ - NULL, /* reset */ - NULL, /* devtotty */ - NULL, /* select */ - NULL, /* mmap */ - NULL /* strategy */ +static struct cdevsw fore_cdev = { + /* open */ noopen, + /* close */ noclose, + /* 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/iicbus/iic.c b/sys/dev/iicbus/iic.c index f7c7d6ea79489..fbdcbcc35c457 100644 --- a/sys/dev/iicbus/iic.c +++ b/sys/dev/iicbus/iic.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: iic.c,v 1.9 1999/05/08 21:59:03 dfr Exp $ + * $Id: iic.c,v 1.10 1999/05/09 13:00:35 phk Exp $ * */ #include <sys/param.h> @@ -92,10 +92,27 @@ static d_read_t iicread; static d_ioctl_t iicioctl; #define CDEV_MAJOR 105 -static struct cdevsw iic_cdevsw = - { iicopen, iicclose, iicread, iicwrite, /*105*/ - iicioctl, nullstop, nullreset, nodevtotty, /*iic*/ - seltrue, nommap, nostrat, "iic", NULL, -1 }; +static struct cdevsw iic_cdevsw = { + /* open */ iicopen, + /* close */ iicclose, + /* 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 +}; /* * iicprobe() diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index 5d4a7c2330604..6847f43d41222 100644 --- a/sys/dev/joy/joy.c +++ b/sys/dev/joy/joy.c @@ -92,10 +92,27 @@ static d_close_t joyclose; static d_read_t joyread; static d_ioctl_t joyioctl; -static struct cdevsw joy_cdevsw = - { joyopen, joyclose, joyread, nowrite, /*51*/ - joyioctl, nostop, nullreset, nodevtotty,/*joystick */ - seltrue, nommap, NULL, "joy", NULL, -1 }; +static struct cdevsw joy_cdevsw = { + /* open */ joyopen, + /* close */ joyclose, + /* 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 +}; static int get_tick __P((void)); diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c index ecbac638b98ed..ea828f0f0eb0f 100644 --- a/sys/dev/kbd/atkbd.c +++ b/sys/dev/kbd/atkbd.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atkbd.c,v 1.9 1999/05/18 11:05:58 yokota Exp $ + * $Id: atkbd.c,v 1.10 1999/05/20 09:49:33 yokota Exp $ */ #include "atkbd.h" @@ -64,11 +64,26 @@ static d_read_t atkbdread; static d_ioctl_t atkbdioctl; static d_poll_t atkbdpoll; -static struct cdevsw atkbd_cdevsw = { - atkbdopen, atkbdclose, atkbdread, nowrite, - atkbdioctl, nostop, nullreset, nodevtotty, - atkbdpoll, nommap, NULL, ATKBD_DRIVER_NAME, - NULL, -1, +static struct cdevsw atkbd_cdevsw = { + /* open */ atkbdopen, + /* close */ atkbdclose, + /* read */ atkbdread, + /* write */ nowrite, + /* ioctl */ atkbdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ atkbdpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ ATKBD_DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* KBD_INSTALL_CDEV */ diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index 75624229f0147..47d9d5e712053 100644 --- a/sys/dev/kbd/kbd.c +++ b/sys/dev/kbd/kbd.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: kbd.c,v 1.6 1999/05/18 11:08:39 yokota Exp $ + * $Id: kbd.c,v 1.7 1999/05/30 14:55:24 phk Exp $ */ #include "kbd.h" @@ -406,10 +406,25 @@ static d_mmap_t kbdmmap; #define CDEV_MAJOR 112 static struct cdevsw kbd_cdevsw = { - kbdopen, kbdclose, kbdread, kbdwrite, /* ??? */ - kbdioctl, nullstop, noreset, kbddevtotty, - kbdpoll, kbdmmap, nostrategy, "kbd", - NULL, -1, nodump, nopsize, + /* open */ kbdopen, + /* close */ kbdclose, + /* read */ kbdread, + /* write */ kbdwrite, + /* ioctl */ kbdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ kbddevtotty, + /* poll */ kbdpoll, + /* mmap */ kbdmmap, + /* strategy */ nostrategy, + /* name */ "kbd", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; static void diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 8af4105bfa47c..c57a67566ed7a 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.105 1999/05/07 07:03:27 phk Exp $ + * $Id: mcd.c,v 1.106 1999/05/08 07:02:30 phk Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -221,11 +221,26 @@ static d_strategy_t mcdstrategy; static struct cdevsw mcd_cdevsw = { - mcdopen, mcdclose, physread, nowrite, - mcdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, mcdstrategy, "mcd", - NULL, -1, nodump, nopsize, - D_DISK}; + /* open */ mcdopen, + /* close */ mcdclose, + /* 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 +}; #define mcd_put(port,byte) outb(port,byte) diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index e952af08d9419..b70cf156eadc3 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.41 1999/05/06 18:12:28 peter Exp $ + * $Id: mse.c,v 1.42 1999/05/06 18:44:02 peter Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -82,10 +82,27 @@ static d_ioctl_t mseioctl; static d_poll_t msepoll; #define CDEV_MAJOR 27 -static struct cdevsw mse_cdevsw = - { mseopen, mseclose, mseread, nowrite, /*27*/ - mseioctl, nostop, nullreset, nodevtotty,/* mse */ - msepoll, nommap, NULL, "mse", NULL, -1 }; +static struct cdevsw mse_cdevsw = { + /* open */ mseopen, + /* close */ mseclose, + /* 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 +}; static ointhand2_t mseintr; diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 552e2024c382b..bf5e65761909a 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pci.c,v 1.104 1999/05/20 15:33:31 gallatin Exp $ + * $Id: pci.c,v 1.105 1999/05/30 10:54:31 dfr Exp $ * */ @@ -847,8 +847,25 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) #define PCI_CDEV 78 static struct cdevsw pcicdev = { - pci_open, pci_close, noread, nowrite, pci_ioctl, nostop, noreset, - nodevtotty, seltrue, nommap, nostrategy, "pci", 0, PCI_CDEV + /* open */ pci_open, + /* close */ pci_close, + /* 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 }; #ifdef DEVFS diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c index cc2f94d6bc46d..ab61978305b63 100644 --- a/sys/dev/ppbus/lpt.c +++ b/sys/dev/ppbus/lpt.c @@ -48,7 +48,7 @@ * from: unknown origin, 386BSD 0.1 * From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp * From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp - * $Id: lpt.c,v 1.2 1999/02/14 16:19:16 nsouch Exp $ + * $Id: lpt.c,v 1.3 1999/04/28 10:51:35 dt Exp $ */ /* @@ -206,10 +206,27 @@ static d_read_t lptread; static d_ioctl_t lptioctl; #define CDEV_MAJOR 16 -static struct cdevsw lpt_cdevsw = - { lptopen, lptclose, lptread, lptwrite, /*16*/ - lptioctl, nullstop, nullreset, nodevtotty, /* lpt */ - seltrue, nommap, nostrat, LPT_NAME, NULL, -1 }; +static struct cdevsw lpt_cdevsw = { + /* open */ lptopen, + /* close */ lptclose, + /* 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 +}; static int lpt_request_ppbus(struct lpt_data *sc, int how) diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c index d3a09a1b9ba0f..315ea29dafbe4 100644 --- a/sys/dev/ppbus/ppi.c +++ b/sys/dev/ppbus/ppi.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ppi.c,v 1.12 1999/02/14 11:59:59 nsouch Exp $ + * $Id: ppi.c,v 1.13 1999/04/28 10:51:39 dt Exp $ * */ #include "ppi.h" @@ -91,10 +91,27 @@ static d_write_t ppiwrite; static d_read_t ppiread; #define CDEV_MAJOR 82 -static struct cdevsw ppi_cdevsw = - { ppiopen, ppiclose, ppiread, ppiwrite, /* 82 */ - ppiioctl, nullstop, nullreset, nodevtotty, - seltrue, nommap, nostrat, "ppi", NULL, -1 }; +static struct cdevsw ppi_cdevsw = { + /* open */ ppiopen, + /* close */ ppiclose, + /* 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 +}; #ifdef PERIPH_1284 diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c index 6f80fb040ace6..8fc552867e98a 100644 --- a/sys/dev/ppbus/pps.c +++ b/sys/dev/ppbus/pps.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: pps.c,v 1.16 1999/04/25 08:58:10 phk Exp $ + * $Id: pps.c,v 1.17 1999/05/06 22:03:14 peter Exp $ * * This driver implements a draft-mogul-pps-api-02.txt PPS source. * @@ -60,11 +60,27 @@ static d_close_t ppsclose; static d_ioctl_t ppsioctl; #define CDEV_MAJOR 89 -static struct cdevsw pps_cdevsw = - { ppsopen, ppsclose, noread, nowrite, - ppsioctl, nullstop, nullreset, nodevtotty, - seltrue, nommap, nostrat, PPS_NAME, - NULL, -1 }; +static struct cdevsw pps_cdevsw = { + /* open */ ppsopen, + /* close */ ppsclose, + /* 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 +}; static struct ppb_device * diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 1671c7d04dc3c..fdcbcf6b54d98 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -99,12 +99,26 @@ static d_stop_t rcstop; static d_devtotty_t rcdevtotty; #define CDEV_MAJOR 63 -static struct cdevsw rc_cdevsw = { - rcopen, rcclose, rcread, rcwrite, - rcioctl, rcstop, noreset, rcdevtotty, - ttpoll, nommap, NULL, "rc", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw rc_cdevsw = { + /* open */ rcopen, + /* close */ rcclose, + /* read */ rcread, + /* write */ rcwrite, + /* ioctl */ rcioctl, + /* stop */ rcstop, + /* reset */ noreset, + /* devtotty */ rcdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "rc", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; /* Per-board structure */ diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 1824841effb39..a3c2382dd0be0 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rp.c,v 1.25 1999/05/06 18:44:04 peter Exp $ + * $Id: rp.c,v 1.26 1999/05/09 17:07:20 peter Exp $ */ /* @@ -801,12 +801,26 @@ static d_stop_t rpstop; static d_devtotty_t rpdevtotty; #define CDEV_MAJOR 81 -static struct cdevsw rp_cdevsw = { - rpopen, rpclose, rpread, rpwrite, - rpioctl, rpstop, noreset, rpdevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw rp_cdevsw = { + /* open */ rpopen, + /* close */ rpclose, + /* read */ rpread, + /* write */ rpwrite, + /* ioctl */ rpioctl, + /* stop */ rpstop, + /* reset */ noreset, + /* devtotty */ rpdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static int rp_controller_port = 0; diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index 519b28c3e3e26..24af2e119c3d7 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.44 1999/05/07 07:03:29 phk Exp $ */ +/* $Id: scd.c,v 1.45 1999/05/09 20:29:04 phk Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -193,11 +193,26 @@ static d_strategy_t scdstrategy; #define CDEV_MAJOR 45 #define BDEV_MAJOR 16 static struct cdevsw scd_cdevsw = { - scdopen, scdclose, physread, nowrite, - scdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, scdstrategy, "scd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 }; + /* open */ scdopen, + /* close */ scdclose, + /* 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 +}; static int diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 7a6c60d3a91b6..0565390eeb8d2 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.84 1999/05/08 07:02:31 phk Exp $ + * $Id: si.c,v 1.85 1999/05/09 17:07:21 peter Exp $ */ #ifndef lint @@ -179,12 +179,26 @@ static d_stop_t sistop; static d_devtotty_t sidevtotty; #define CDEV_MAJOR 68 -static struct cdevsw si_cdevsw = { - siopen, siclose, siread, siwrite, - siioctl, sistop, noreset, sidevtotty, - ttpoll, nommap, NULL, "si", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw si_cdevsw = { + /* open */ siopen, + /* close */ siclose, + /* read */ siread, + /* write */ siwrite, + /* ioctl */ siioctl, + /* stop */ sistop, + /* reset */ noreset, + /* devtotty */ sidevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "si", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; #ifdef SI_DEBUG /* use: ``options "SI_DEBUG"'' in your config file */ diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 4439ed2108c8d..c0a33cde32c8b 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.243 1999/05/28 09:37:11 dfr Exp $ + * $Id: sio.c,v 1.244 1999/05/30 11:14:39 dfr Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -361,12 +361,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; int comconsole = -1; diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c index c812b40aa588d..f411f8aca3ae7 100644 --- a/sys/dev/smbus/smb.c +++ b/sys/dev/smbus/smb.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: smb.c,v 1.10 1999/05/08 21:59:08 dfr Exp $ + * $Id: smb.c,v 1.11 1999/05/09 13:00:37 phk Exp $ * */ #include <sys/param.h> @@ -93,10 +93,27 @@ static d_read_t smbread; static d_ioctl_t smbioctl; #define CDEV_MAJOR 106 -static struct cdevsw smb_cdevsw = - { smbopen, smbclose, smbread, smbwrite, /*106*/ - smbioctl, nullstop, nullreset, nodevtotty, /*smb*/ - seltrue, nommap, nostrat, "smb", NULL, -1 }; +static struct cdevsw smb_cdevsw = { + /* open */ smbopen, + /* close */ smbclose, + /* 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 +}; /* * smbprobe() diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index 1018083b5315e..8b45c8aca9630 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -46,10 +46,27 @@ static d_ioctl_t snpioctl; static d_poll_t snppoll; #define CDEV_MAJOR 53 -static struct cdevsw snp_cdevsw = - { snpopen, snpclose, snpread, snpwrite, /*53*/ - snpioctl, nostop, nullreset, nodevtotty,/* snoop */ - snppoll, nommap, NULL, "snp", NULL, -1 }; +static struct cdevsw snp_cdevsw = { + /* open */ snpopen, + /* close */ snpclose, + /* 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 +}; #ifndef MIN diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 460ef789a393a..759a9fcd9c38a 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.34 1998/06/07 17:11:00 dfr Exp $ + * $Id: spkr.c,v 1.35 1998/08/24 02:28:16 bde Exp $ */ #include "speaker.h" @@ -35,10 +35,27 @@ static d_write_t spkrwrite; static d_ioctl_t spkrioctl; #define CDEV_MAJOR 26 -static struct cdevsw spkr_cdevsw = - { spkropen, spkrclose, noread, spkrwrite, /*26*/ - spkrioctl, nostop, nullreset, nodevtotty,/* spkr */ - seltrue, nommap, NULL, "spkr", NULL, -1 }; +static struct cdevsw spkr_cdevsw = { + /* open */ spkropen, + /* close */ spkrclose, + /* 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 +}; /**************** MACHINE DEPENDENT PART STARTS HERE ************************* * diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c index fdf98bd23b540..e3790e8912b0e 100644 --- a/sys/dev/streams/streams.c +++ b/sys/dev/streams/streams.c @@ -105,20 +105,26 @@ static struct fileops svr4_netops = { #define CDEV_MAJOR 103 static struct cdevsw streams_cdevsw = { - streamsopen, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - "streams", - NULL, - -1 }; + /* open */ streamsopen, + /* close */ noclose, + /* 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 +}; struct streams_softc { struct isa_device *dev; diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 4a974438a456b..41ee89a729906 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.302 1999/05/10 14:01:32 dfr Exp $ + * $Id: syscons.c,v 1.303 1999/05/12 04:45:56 bde Exp $ */ #include "sc.h" @@ -365,12 +365,26 @@ static d_write_t scwrite; static d_ioctl_t scioctl; static d_mmap_t scmmap; -struct cdevsw sc_cdevsw = { - scopen, scclose, scread, scwrite, - scioctl, nullstop, noreset, scdevtotty, - ttpoll, scmmap, nostrategy, "sc", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sc_cdevsw = { + /* open */ scopen, + /* close */ scclose, + /* read */ scread, + /* write */ scwrite, + /* ioctl */ scioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ scdevtotty, + /* poll */ ttpoll, + /* mmap */ scmmap, + /* strategy */ nostrategy, + /* name */ "sc", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; #ifdef __i386__ diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index c0fa6bb5a30e7..f8de2f74f671b 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -121,10 +121,25 @@ d_poll_t ugenpoll; #define UGEN_CDEV_MAJOR 114 static struct cdevsw ugen_cdevsw = { - ugenopen, ugenclose, ugenread, ugenwrite, - ugenioctl, nostop, nullreset, nodevtotty, - ugenpoll, nommap, nostrat, - "ugen", NULL, -1 + /* open */ ugenopen, + /* close */ ugenclose, + /* 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 47928092c96a4..a6e65cb35bd51 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -133,10 +133,25 @@ d_poll_t uhidpoll; #define UHID_CDEV_MAJOR 122 static struct cdevsw uhid_cdevsw = { - uhidopen, uhidclose, uhidread, uhidwrite, - uhidioctl, nostop, nullreset, nodevtotty, - uhidpoll, nommap, nostrat, - "uhid", NULL, -1 + /* open */ uhidopen, + /* close */ uhidclose, + /* 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/ukbd.c b/sys/dev/usb/ukbd.c index 33a7d05422314..c10777a373361 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -136,11 +136,26 @@ static d_read_t ukbdread; static d_ioctl_t ukbdioctl; static d_poll_t ukbdpoll; -static struct cdevsw ukbd_cdevsw = { - ukbdopen, ukbdclose, ukbdread, nowrite, - ukbdioctl, nostop, nullreset, nodevtotty, - ukbdpoll, nommap, NULL, DRIVER_NAME, - NULL, -1, +static struct cdevsw ukbd_cdevsw = { + /* open */ ukbdopen, + /* close */ ukbdclose, + /* read */ ukbdread, + /* write */ nowrite, + /* ioctl */ ukbdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ ukbdpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* KBD_INSTALL_CDEV */ diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index b997e3d90af91..fb6c30c44a9db 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -130,11 +130,26 @@ static d_ioctl_t ulptioctl; #define ULPT_CDEV_MAJOR 113 -static struct cdevsw ulpt_cdevsw = { - ulptopen, ulptclose, noread, ulptwrite, - ulptioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, nostrat, - "ulpt", NULL, -1 +static struct cdevsw ulpt_cdevsw = { + /* open */ ulptopen, + /* close */ ulptclose, + /* 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 4f80e6a4624fb..a97adb4c0fb52 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -157,10 +157,25 @@ static d_poll_t ums_poll; #define UMS_CDEV_MAJOR 111 static struct cdevsw ums_cdevsw = { - ums_open, ums_close, ums_read, nowrite, - ums_ioctl, nostop, nullreset, nodevtotty, - ums_poll, nommap, nostrat, - "ums", NULL, -1 + /* open */ ums_open, + /* close */ ums_close, + /* 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 }; #endif diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index d7d31c2b936bb..3119ca9cd4af8 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -116,10 +116,25 @@ d_ioctl_t usbioctl; int usbpoll __P((dev_t, int, struct proc *)); struct cdevsw usb_cdevsw = { - usbopen, usbclose, noread, nowrite, - usbioctl, nullstop, nullreset, nodevtotty, - usbpoll, nommap, nostrat, - "usb", NULL, -1 + /* open */ usbopen, + /* close */ usbclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ usbioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ usbpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "usb", + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index f3db33627f929..32880387955c4 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -38,7 +38,7 @@ * from: Utah Hdr: vn.c 1.13 94/04/02 * * from: @(#)vn.c 8.6 (Berkeley) 4/1/94 - * $Id: vn.c,v 1.78 1999/05/07 10:10:10 phk Exp $ + * $Id: vn.c,v 1.79 1999/05/11 19:54:02 phk Exp $ */ /* @@ -121,11 +121,26 @@ static d_parms_t vnparms; */ static struct cdevsw vn_cdevsw = { - vnopen, vnclose, physread, physwrite, - vnioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, vnstrategy, "vn", - vnparms, -1, vndump, vnsize, - D_DISK|D_CANFREE, 0, -1 }; + /* open */ vnopen, + /* close */ vnclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ vnioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ vnstrategy, + /* name */ "vn", + /* parms */ vnparms, + /* maj */ CDEV_MAJOR, + /* dump */ vndump, + /* psize */ vnsize, + /* flags */ D_DISK|D_CANFREE, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR +}; #define vnunit(dev) dkunit(dev) diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c index 703708c636703..49bba22bc7b80 100644 --- a/sys/fs/coda/coda_fbsd.c +++ b/sys/fs/coda/coda_fbsd.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_fbsd.c,v 1.12 1999/01/27 20:09:17 dillon Exp $ + * $Id: coda_fbsd.c,v 1.13 1999/01/28 00:57:46 dillon Exp $ * */ @@ -73,11 +73,26 @@ static void *coda_devfs_token[NVCODA]; #define VC_DEV_NO 93 -static struct cdevsw codadevsw = -{ - vc_nb_open, vc_nb_close, vc_nb_read, vc_nb_write, /*93*/ - vc_nb_ioctl, nostop, nullreset, nodevtotty, - vc_nb_poll, nommap, NULL, "Coda", NULL, -1 +static struct cdevsw codadevsw = { + /* open */ vc_nb_open, + /* close */ vc_nb_close, + /* 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 }; int vcdebug = 1; diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index 1ff7fd72922e9..2f26794a25cd7 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -1,4 +1,4 @@ -/* $Id: ccd.c,v 1.46 1999/05/07 10:09:42 phk Exp $ */ +/* $Id: ccd.c,v 1.47 1999/05/11 19:54:00 phk Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -174,11 +174,26 @@ static d_psize_t ccdsize; #define BDEV_MAJOR 21 static struct cdevsw ccd_cdevsw = { - ccdopen, ccdclose, physread, physwrite, - ccdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, ccdstrategy, "ccd", - NULL, -1, ccddump, ccdsize, - D_DISK, 0, -1 }; + /* open */ ccdopen, + /* close */ ccdclose, + /* 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 +}; /* called during module initialization */ static void ccdattach __P((void)); diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index e9a044bee2269..b39c89df7206b 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.47 1999/05/02 21:39:52 peter Exp $ + * dgb.c $Id: dgb.c,v 1.48 1999/05/08 07:02:24 phk Exp $ * * Digiboard driver. * @@ -224,12 +224,26 @@ static d_stop_t dgbstop; static d_devtotty_t dgbdevtotty; #define CDEV_MAJOR 58 -static struct cdevsw dgb_cdevsw = { - dgbopen, dgbclose, dgbread, dgbwrite, - dgbioctl, dgbstop, noreset, dgbdevtotty, - ttpoll, nommap, NULL, "dgb", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw dgb_cdevsw = { + /* open */ dgbopen, + /* close */ dgbclose, + /* read */ dgbread, + /* write */ dgbwrite, + /* ioctl */ dgbioctl, + /* stop */ dgbstop, + /* reset */ noreset, + /* devtotty */ dgbdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "dgb", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static speed_t dgbdefaultrate = TTYDEF_SPEED; diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c index 291e520c41927..5f3ff63fcd979 100644 --- a/sys/gnu/i386/isa/dgm.c +++ b/sys/gnu/i386/isa/dgm.c @@ -1,5 +1,5 @@ /*- - * $Id: dgm.c,v 1.12 1999/05/03 09:32:31 brian Exp $ + * $Id: dgm.c,v 1.13 1999/05/08 07:02:25 phk Exp $ * * This driver and the associated header files support the ISA PC/Xem * Digiboards. Its evolutionary roots are described below. @@ -228,12 +228,26 @@ static d_stop_t dgmstop; static d_devtotty_t dgmdevtotty; #define CDEV_MAJOR 101 -static struct cdevsw dgm_cdevsw = { - dgmopen, dgmclose, dgmread, dgmwrite, - dgmioctl, dgmstop, noreset, dgmdevtotty, - ttpoll, nommap, NULL, "dgm", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw dgm_cdevsw = { + /* open */ dgmopen, + /* close */ dgmclose, + /* read */ dgmread, + /* write */ dgmwrite, + /* ioctl */ dgmioctl, + /* stop */ dgmstop, + /* reset */ noreset, + /* devtotty */ dgmdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "dgm", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static speed_t dgmdefaultrate = TTYDEF_SPEED; diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index ad3313c0a33ce..c8fbf1cf1548e 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -15,7 +15,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.85 1999/05/09 13:00:41 phk Exp $ + * $Id: apm.c,v 1.86 1999/05/11 19:54:03 phk Exp $ */ #include "opt_devfs.h" @@ -88,10 +88,27 @@ static d_close_t apmclose; static d_ioctl_t apmioctl; #define CDEV_MAJOR 39 -static struct cdevsw apm_cdevsw = - { apmopen, apmclose, noread, nowrite, /*39*/ - apmioctl, nostop, nullreset, nodevtotty,/* APM */ - seltrue, nommap, NULL , "apm" ,NULL, -1}; +static struct cdevsw apm_cdevsw = { + /* open */ apmopen, + /* close */ apmclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ apmioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "apm", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; /* setup APM GDT discriptors */ static void diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index ad3313c0a33ce..c8fbf1cf1548e 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -15,7 +15,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.85 1999/05/09 13:00:41 phk Exp $ + * $Id: apm.c,v 1.86 1999/05/11 19:54:03 phk Exp $ */ #include "opt_devfs.h" @@ -88,10 +88,27 @@ static d_close_t apmclose; static d_ioctl_t apmioctl; #define CDEV_MAJOR 39 -static struct cdevsw apm_cdevsw = - { apmopen, apmclose, noread, nowrite, /*39*/ - apmioctl, nostop, nullreset, nodevtotty,/* APM */ - seltrue, nommap, NULL , "apm" ,NULL, -1}; +static struct cdevsw apm_cdevsw = { + /* open */ apmopen, + /* close */ apmclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ apmioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "apm", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; /* setup APM GDT discriptors */ static void diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c index 32b181ddd5271..6b7efb4d56f1e 100644 --- a/sys/i386/i386/cons.c +++ b/sys/i386/i386/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.64 1999/04/28 10:52:04 dt Exp $ + * $Id: cons.c,v 1.65 1999/05/08 06:39:20 phk Exp $ */ #include "opt_devfs.h" @@ -65,12 +65,26 @@ static d_ioctl_t cnioctl; static d_poll_t cnpoll; #define CDEV_MAJOR 0 -static struct cdevsw cn_cdevsw = { - cnopen, cnclose, cnread, cnwrite, - cnioctl, nullstop, nullreset, nodevtotty, - cnpoll, nommap, NULL, "console", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw cn_cdevsw = { + /* open */ cnopen, + /* close */ cnclose, + /* 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 }; static dev_t cn_dev_t; /* seems to be never really used */ diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index 04cf9264829dd..20a7820fd9a82 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.60 1999/05/08 17:48:21 peter Exp $ + * $Id: mem.c,v 1.61 1999/05/11 19:54:06 phk Exp $ */ /* @@ -87,10 +87,27 @@ static d_mmap_t memmmap; static d_poll_t mmpoll; #define CDEV_MAJOR 2 -static struct cdevsw mem_cdevsw = - { mmopen, mmclose, mmrw, mmrw, /*2*/ - mmioctl, nullstop, nullreset, nodevtotty,/* memory */ - mmpoll, memmmap, NULL, "mem", NULL, -1 }; +static struct cdevsw mem_cdevsw = { + /* open */ mmopen, + /* close */ mmclose, + /* 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 */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; static struct random_softc random_softc[16]; static caddr_t zbuf; diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c index 2e14e041c74b9..4a6a071cdef04 100644 --- a/sys/i386/isa/asc.c +++ b/sys/i386/isa/asc.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * $Id: asc.c,v 1.35 1999/04/28 10:52:14 dt Exp $ + * $Id: asc.c,v 1.36 1999/05/06 18:12:24 peter Exp $ */ #include "asc.h" @@ -199,10 +199,27 @@ static d_poll_t ascpoll; #define CDEV_MAJOR 71 -static struct cdevsw asc_cdevsw = - { ascopen, ascclose, ascread, nowrite, /*71*/ - ascioctl, nostop, nullreset, nodevtotty, /* asc */ - ascpoll, nommap, NULL, "asc", NULL, -1 }; +static struct cdevsw asc_cdevsw = { + /* open */ ascopen, + /* close */ ascclose, + /* 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 +}; #define STATIC static diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c index 99333d472725c..644fb3f4713a6 100644 --- a/sys/i386/isa/atapi-cd.c +++ b/sys/i386/isa/atapi-cd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-cd.c,v 1.17 1999/05/07 07:03:23 phk Exp $ + * $Id: atapi-cd.c,v 1.18 1999/05/11 10:39:27 sos Exp $ */ #include "wdc.h" @@ -61,11 +61,25 @@ static d_strategy_t acdstrategy; #define CDEV_MAJOR 69 #define BDEV_MAJOR 19 static struct cdevsw acd_cdevsw = { - acdopen, acdclose, physread, physwrite, - acdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, acdstrategy, "wcd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 + /* open */ acdopen, + /* close */ acdclose, + /* 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 }; #define NUNIT 16 /* Max # of devices */ diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c index 28d61a1bbace6..f1b5953faf7bb 100644 --- a/sys/i386/isa/ctx.c +++ b/sys/i386/isa/ctx.c @@ -8,7 +8,7 @@ * of this software, nor does the author assume any responsibility * for damages incurred with its use. * - * $Id: ctx.c,v 1.29 1998/12/09 02:56:48 eivind Exp $ + * $Id: ctx.c,v 1.30 1999/04/28 10:52:19 dt Exp $ */ /* @@ -146,10 +146,27 @@ static d_write_t ctxwrite; static d_ioctl_t ctxioctl; #define CDEV_MAJOR 40 -static struct cdevsw ctx_cdevsw = - { ctxopen, ctxclose, ctxread, ctxwrite, /*40*/ - ctxioctl, nostop, nullreset, nodevtotty,/* cortex */ - seltrue, nommap, NULL, "ctx", NULL, -1 }; +static struct cdevsw ctx_cdevsw = { + /* open */ ctxopen, + /* close */ ctxclose, + /* 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 +}; #define LUTSIZE 256 /* buffer size for Look Up Table (LUT) */ diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c index 42340009cbdc3..7f5624efc4d46 100644 --- a/sys/i386/isa/cx.c +++ b/sys/i386/isa/cx.c @@ -90,12 +90,26 @@ static d_devtotty_t cxdevtotty; #define CDEV_MAJOR 42 /* Don't make this static, since if_cx.c uses it. */ -struct cdevsw cx_cdevsw = { - cxopen, cxclose, cxread, cxwrite, - cxioctl, cxstop, nullreset, cxdevtotty, - ttpoll, nommap, NULL, "cx", - NULL, -1, nodump, nopsize, - D_TTY, +struct cdevsw cx_cdevsw = { + /* open */ cxopen, + /* close */ cxclose, + /* read */ cxread, + /* write */ cxwrite, + /* ioctl */ cxioctl, + /* stop */ cxstop, + /* reset */ noreset, + /* devtotty */ cxdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "cx", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; #else struct tty *cx_tty [NCX*NCHAN]; /* tty data */ diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 93e8200496178..70d0466d7923e 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.87 1999/04/27 11:14:54 phk Exp $ + * $Id: cy.c,v 1.88 1999/05/28 13:23:21 bde Exp $ */ #include "opt_compat.h" @@ -388,12 +388,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 48 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static int comconsole = -1; diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index cc51f9338364e..cd7001be81516 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.143 1999/05/11 04:58:30 bde Exp $ + * $Id: fd.c,v 1.144 1999/05/30 11:10:54 dfr Exp $ * */ @@ -370,16 +370,31 @@ static d_close_t fdclose; static d_ioctl_t fdioctl; static d_strategy_t fdstrategy; -static struct cdevsw fd_cdevsw = { - Fdopen, fdclose, physread, physwrite, - fdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, fdstrategy, "fd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 -}; #define CDEV_MAJOR 9 #define BDEV_MAJOR 2 +static struct cdevsw fd_cdevsw = { + /* open */ Fdopen, + /* close */ fdclose, + /* 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 +}; + static int fdc_err(struct fdc_data *fdc, const char *s) { diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c index b289f571bc8ac..cf67cdc550ba8 100644 --- a/sys/i386/isa/gpib.c +++ b/sys/i386/isa/gpib.c @@ -75,10 +75,27 @@ static d_write_t gpwrite; static d_ioctl_t gpioctl; #define CDEV_MAJOR 44 -static struct cdevsw gp_cdevsw = - { gpopen, gpclose, noread, gpwrite, /*44*/ - gpioctl, nostop, nullreset, nodevtotty,/* GPIB */ - seltrue, nommap, NULL, "gp", NULL, -1 }; +static struct cdevsw gp_cdevsw = { + /* open */ gpopen, + /* close */ gpclose, + /* 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 +}; #define BUFSIZE 1024 #define ATTACHED 0x08 diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c index 7295ae75880d5..9ac7b435a039f 100644 --- a/sys/i386/isa/gsc.c +++ b/sys/i386/isa/gsc.c @@ -194,10 +194,27 @@ static d_read_t gscread; static d_ioctl_t gscioctl; #define CDEV_MAJOR 47 -static struct cdevsw gsc_cdevsw = - { gscopen, gscclose, gscread, nowrite, /*47*/ - gscioctl, nostop, nullreset, nodevtotty,/* gsc */ - seltrue, nommap, NULL, "gsc", NULL, -1 }; +static struct cdevsw gsc_cdevsw = { + /* open */ gscopen, + /* close */ gscclose, + /* 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 84b4277fe0ebf..0ade414ae2367 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: istallion.c,v 1.26 1999/04/28 10:52:35 dt Exp $ + * $Id: istallion.c,v 1.27 1999/05/08 07:02:29 phk Exp $ */ /*****************************************************************************/ @@ -640,12 +640,26 @@ struct isa_driver stlidriver = { */ #define CDEV_MAJOR 75 -static struct cdevsw stli_cdevsw = { - stliopen, stliclose, stliread, stliwrite, - stliioctl, stlistop, noreset, stlidevtotty, - ttpoll, nommap, NULL, stli_drvname, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw stli_cdevsw = { + /* open */ stliopen, + /* close */ stliclose, + /* read */ stliread, + /* write */ stliwrite, + /* ioctl */ stliioctl, + /* stop */ stlistop, + /* reset */ noreset, + /* devtotty */ stlidevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ stli_drvname, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static int stli_devsw_installed; diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c index 5d4a7c2330604..6847f43d41222 100644 --- a/sys/i386/isa/joy.c +++ b/sys/i386/isa/joy.c @@ -92,10 +92,27 @@ static d_close_t joyclose; static d_read_t joyread; static d_ioctl_t joyioctl; -static struct cdevsw joy_cdevsw = - { joyopen, joyclose, joyread, nowrite, /*51*/ - joyioctl, nostop, nullreset, nodevtotty,/*joystick */ - seltrue, nommap, NULL, "joy", NULL, -1 }; +static struct cdevsw joy_cdevsw = { + /* open */ joyopen, + /* close */ joyclose, + /* 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 +}; static int get_tick __P((void)); diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c index 28b91e745331d..180252b8cfa3a 100644 --- a/sys/i386/isa/labpc.c +++ b/sys/i386/isa/labpc.c @@ -291,10 +291,27 @@ static d_ioctl_t labpcioctl; static d_strategy_t labpcstrategy; #define CDEV_MAJOR 66 -static struct cdevsw labpc_cdevsw = - { labpcopen, labpcclose, physread, physwrite, - labpcioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, labpcstrategy, "labpc", NULL, -1 }; +static struct cdevsw labpc_cdevsw = { + /* open */ labpcopen, + /* close */ labpcclose, + /* 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 +}; static ointhand2_t labpcintr; static void start(struct ctlr *ctlr); diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c index a4a4729d0394c..2769d41e86b0d 100644 --- a/sys/i386/isa/loran.c +++ b/sys/i386/isa/loran.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: loran.c,v 1.17 1999/05/06 22:13:04 peter Exp $ + * $Id: loran.c,v 1.18 1999/05/08 14:36:48 phk Exp $ * * This device-driver helps the userland controlprogram for a LORAN-C * receiver avoid monopolizing the CPU. @@ -635,11 +635,27 @@ struct isa_driver lorandriver = { }; #define CDEV_MAJOR 94 -static struct cdevsw loran_cdevsw = - { loranopen, loranclose, loranread, loranwrite, - noioctl, nullstop, nullreset, nodevtotty, - seltrue, nommap, nostrat, "loran", - NULL, -1 }; +static struct cdevsw loran_cdevsw = { + /* open */ loranopen, + /* close */ loranclose, + /* 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 +}; static int loran_devsw_installed; diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index 6f0f8fe69caf7..fb4a2612c93c6 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -337,7 +337,7 @@ static char MATCDVERSION[]="Version 1(26) 18-Oct-95"; static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV"; /* The proceeding strings may not be changed*/ -/* $Id: matcd.c,v 1.38 1999/04/28 10:53:12 dt Exp $ */ +/* $Id: matcd.c,v 1.39 1999/05/07 07:03:36 phk Exp $ */ /*--------------------------------------------------------------------------- Include declarations @@ -524,11 +524,26 @@ static d_strategy_t matcdstrategy; #define BDEV_MAJOR 17 static struct cdevsw matcd_cdevsw = { - matcdopen, matcdclose, physread, nowrite, - matcdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, matcdstrategy, "matcd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 }; + /* open */ matcdopen, + /* close */ matcdclose, + /* 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 +}; /*--------------------------------------------------------------------------- Internal function declarations diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 8af4105bfa47c..c57a67566ed7a 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.105 1999/05/07 07:03:27 phk Exp $ + * $Id: mcd.c,v 1.106 1999/05/08 07:02:30 phk Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -221,11 +221,26 @@ static d_strategy_t mcdstrategy; static struct cdevsw mcd_cdevsw = { - mcdopen, mcdclose, physread, nowrite, - mcdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, mcdstrategy, "mcd", - NULL, -1, nodump, nopsize, - D_DISK}; + /* open */ mcdopen, + /* close */ mcdclose, + /* 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 +}; #define mcd_put(port,byte) outb(port,byte) diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index e952af08d9419..b70cf156eadc3 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.41 1999/05/06 18:12:28 peter Exp $ + * $Id: mse.c,v 1.42 1999/05/06 18:44:02 peter Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -82,10 +82,27 @@ static d_ioctl_t mseioctl; static d_poll_t msepoll; #define CDEV_MAJOR 27 -static struct cdevsw mse_cdevsw = - { mseopen, mseclose, mseread, nowrite, /*27*/ - mseioctl, nostop, nullreset, nodevtotty,/* mse */ - msepoll, nommap, NULL, "mse", NULL, -1 }; +static struct cdevsw mse_cdevsw = { + /* open */ mseopen, + /* close */ mseclose, + /* 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 +}; static ointhand2_t mseintr; diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index d7591e958d7ed..c44bc55b20f19 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcaudio.c,v 1.47 1999/05/06 18:12:29 peter Exp $ + * $Id: pcaudio.c,v 1.48 1999/05/06 18:58:05 peter Exp $ */ #include "pca.h" @@ -141,10 +141,27 @@ static d_ioctl_t pcaioctl; static d_poll_t pcapoll; #define CDEV_MAJOR 24 -static struct cdevsw pca_cdevsw = - { pcaopen, pcaclose, noread, pcawrite, /*24*/ - pcaioctl, nostop, nullreset, nodevtotty,/* pcaudio */ - pcapoll, nommap, NULL, "pca", NULL, -1 }; +static struct cdevsw pca_cdevsw = { + /* open */ pcaopen, + /* close */ pcaclose, + /* 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 +}; static void pca_continue __P((void)); static void pca_init __P((void)); diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index a72bc32bfc155..aad4feda17f1f 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -132,12 +132,26 @@ static d_devtotty_t pcdevtotty; static d_mmap_t pcmmap; #define CDEV_MAJOR 12 -static struct cdevsw pc_cdevsw = { - pcopen, pcclose, pcread, pcwrite, - pcioctl, nullstop, noreset, pcdevtotty, - ttpoll, pcmmap, nostrategy, "vt", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw pc_cdevsw = { + /* open */ pcopen, + /* close */ pcclose, + /* read */ pcread, + /* write */ pcwrite, + /* ioctl */ pcioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ pcdevtotty, + /* poll */ ttpoll, + /* mmap */ pcmmap, + /* strategy */ nostrategy, + /* name */ "vt", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; #if PCVT_FREEBSD > 205 diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 1671c7d04dc3c..fdcbcf6b54d98 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -99,12 +99,26 @@ static d_stop_t rcstop; static d_devtotty_t rcdevtotty; #define CDEV_MAJOR 63 -static struct cdevsw rc_cdevsw = { - rcopen, rcclose, rcread, rcwrite, - rcioctl, rcstop, noreset, rcdevtotty, - ttpoll, nommap, NULL, "rc", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw rc_cdevsw = { + /* open */ rcopen, + /* close */ rcclose, + /* read */ rcread, + /* write */ rcwrite, + /* ioctl */ rcioctl, + /* stop */ rcstop, + /* reset */ noreset, + /* devtotty */ rcdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "rc", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; /* Per-board structure */ diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c index 1824841effb39..a3c2382dd0be0 100644 --- a/sys/i386/isa/rp.c +++ b/sys/i386/isa/rp.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rp.c,v 1.25 1999/05/06 18:44:04 peter Exp $ + * $Id: rp.c,v 1.26 1999/05/09 17:07:20 peter Exp $ */ /* @@ -801,12 +801,26 @@ static d_stop_t rpstop; static d_devtotty_t rpdevtotty; #define CDEV_MAJOR 81 -static struct cdevsw rp_cdevsw = { - rpopen, rpclose, rpread, rpwrite, - rpioctl, rpstop, noreset, rpdevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw rp_cdevsw = { + /* open */ rpopen, + /* close */ rpclose, + /* read */ rpread, + /* write */ rpwrite, + /* ioctl */ rpioctl, + /* stop */ rpstop, + /* reset */ noreset, + /* devtotty */ rpdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static int rp_controller_port = 0; diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c index 519b28c3e3e26..24af2e119c3d7 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.44 1999/05/07 07:03:29 phk Exp $ */ +/* $Id: scd.c,v 1.45 1999/05/09 20:29:04 phk Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -193,11 +193,26 @@ static d_strategy_t scdstrategy; #define CDEV_MAJOR 45 #define BDEV_MAJOR 16 static struct cdevsw scd_cdevsw = { - scdopen, scdclose, physread, nowrite, - scdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, scdstrategy, "scd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 }; + /* open */ scdopen, + /* close */ scdclose, + /* 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 +}; static int diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index 7a6c60d3a91b6..0565390eeb8d2 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.84 1999/05/08 07:02:31 phk Exp $ + * $Id: si.c,v 1.85 1999/05/09 17:07:21 peter Exp $ */ #ifndef lint @@ -179,12 +179,26 @@ static d_stop_t sistop; static d_devtotty_t sidevtotty; #define CDEV_MAJOR 68 -static struct cdevsw si_cdevsw = { - siopen, siclose, siread, siwrite, - siioctl, sistop, noreset, sidevtotty, - ttpoll, nommap, NULL, "si", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw si_cdevsw = { + /* open */ siopen, + /* close */ siclose, + /* read */ siread, + /* write */ siwrite, + /* ioctl */ siioctl, + /* stop */ sistop, + /* reset */ noreset, + /* devtotty */ sidevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "si", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; #ifdef SI_DEBUG /* use: ``options "SI_DEBUG"'' in your config file */ diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c index 7b4e1bba2f530..f4be1a64109f7 100644 --- a/sys/i386/isa/snd/sound.c +++ b/sys/i386/isa/snd/sound.c @@ -75,10 +75,25 @@ static d_mmap_t sndmmap; #define CDEV_MAJOR 30 static struct cdevsw snd_cdevsw = { - sndopen, sndclose, sndread, sndwrite, - sndioctl, nostop, noreset, nodevtotty, - sndselect, sndmmap, nostrategy, "snd", - NULL, -1, + /* open */ sndopen, + /* close */ sndclose, + /* 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 0718183f3ebad..0d122ae0f95dd 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -93,9 +93,25 @@ static char driver_name[] = "snd"; #define CDEV_MAJOR 30 static struct cdevsw snd_cdevsw = { - sndopen, sndclose, sndread, sndwrite, - sndioctl, nostop, noreset, nodevtotty, - sndpoll, sndmmap, nostrategy, driver_name, + /* open */ sndopen, + /* close */ sndclose, + /* 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 347b260857564..4c8f15d46a717 100644 --- a/sys/i386/isa/spigot.c +++ b/sys/i386/isa/spigot.c @@ -102,10 +102,27 @@ static d_ioctl_t spigot_ioctl; static d_mmap_t spigot_mmap; #define CDEV_MAJOR 11 -static struct cdevsw spigot_cdevsw = - { spigot_open, spigot_close, spigot_read, spigot_write, /*11*/ - spigot_ioctl, nostop, nullreset, nodevtotty,/* Spigot */ - seltrue, spigot_mmap, NULL, "spigot", NULL, -1 }; +static struct cdevsw spigot_cdevsw = { + /* open */ spigot_open, + /* close */ spigot_close, + /* 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 +}; static ointhand2_t spigintr; diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index 460ef789a393a..759a9fcd9c38a 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.34 1998/06/07 17:11:00 dfr Exp $ + * $Id: spkr.c,v 1.35 1998/08/24 02:28:16 bde Exp $ */ #include "speaker.h" @@ -35,10 +35,27 @@ static d_write_t spkrwrite; static d_ioctl_t spkrioctl; #define CDEV_MAJOR 26 -static struct cdevsw spkr_cdevsw = - { spkropen, spkrclose, noread, spkrwrite, /*26*/ - spkrioctl, nostop, nullreset, nodevtotty,/* spkr */ - seltrue, nommap, NULL, "spkr", NULL, -1 }; +static struct cdevsw spkr_cdevsw = { + /* open */ spkropen, + /* close */ spkrclose, + /* 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 +}; /**************** MACHINE DEPENDENT PART STARTS HERE ************************* * diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index 13b3ad75128b5..91cec5db433fc 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stallion.c,v 1.30 1999/05/08 07:02:33 phk Exp $ + * $Id: stallion.c,v 1.31 1999/05/09 17:07:22 peter Exp $ */ /*****************************************************************************/ @@ -535,12 +535,26 @@ COMPAT_PCI_DRIVER (stlpci, stlpcidriver); */ #define CDEV_MAJOR 72 -static struct cdevsw stl_cdevsw = { - stlopen, stlclose, stlread, stlwrite, - stlioctl, stlstop, noreset, stldevtotty, - ttpoll, nommap, NULL, "stl", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw stl_cdevsw = { + /* open */ stlopen, + /* close */ stlclose, + /* read */ stlread, + /* write */ stlwrite, + /* ioctl */ stlioctl, + /* stop */ stlstop, + /* reset */ noreset, + /* devtotty */ stldevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "stl", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; static int stl_devsw_installed; diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c index 3b7b176fd1d13..3385a851008be 100644 --- a/sys/i386/isa/tw.c +++ b/sys/i386/isa/tw.c @@ -221,10 +221,27 @@ static d_write_t twwrite; static d_poll_t twpoll; #define CDEV_MAJOR 19 -static struct cdevsw tw_cdevsw = - { twopen, twclose, twread, twwrite, /*19*/ - noioc, nullstop, nullreset, nodevtotty, /* tw */ - twpoll, nommap, nostrat, "tw", NULL, -1 }; +static struct cdevsw tw_cdevsw = { + /* open */ twopen, + /* close */ twclose, + /* 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 +}; /* * Software control structure for TW523 diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index b9346b886b93f..78ad4e6adea56 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.196 1999/05/07 07:03:30 phk Exp $ + * $Id: wd.c,v 1.197 1999/05/08 18:13:15 peter Exp $ */ /* TODO: @@ -246,11 +246,26 @@ static d_psize_t wdsize; static struct cdevsw wd_cdevsw = { - wdopen, wdclose, physread, physwrite, - wdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wdstrategy, "wd", - NULL, -1, wddump, wdsize, - D_DISK, 0, -1 }; + /* open */ wdopen, + /* close */ wdclose, + /* 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 +}; static int atapictrlr; diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c index 99333d472725c..644fb3f4713a6 100644 --- a/sys/i386/isa/wd_cd.c +++ b/sys/i386/isa/wd_cd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-cd.c,v 1.17 1999/05/07 07:03:23 phk Exp $ + * $Id: atapi-cd.c,v 1.18 1999/05/11 10:39:27 sos Exp $ */ #include "wdc.h" @@ -61,11 +61,25 @@ static d_strategy_t acdstrategy; #define CDEV_MAJOR 69 #define BDEV_MAJOR 19 static struct cdevsw acd_cdevsw = { - acdopen, acdclose, physread, physwrite, - acdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, acdstrategy, "wcd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 + /* open */ acdopen, + /* close */ acdclose, + /* 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 }; #define NUNIT 16 /* Max # of devices */ diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c index 8aa5e11feb378..d03a2014edacd 100644 --- a/sys/i386/isa/wfd.c +++ b/sys/i386/isa/wfd.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wfd.c,v 1.22 1999/04/28 10:53:04 dt Exp $ + * $Id: wfd.c,v 1.23 1999/05/07 07:03:31 phk Exp $ */ /* @@ -61,11 +61,26 @@ static d_strategy_t wfdstrategy; #define BDEV_MAJOR 1 static struct cdevsw wfd_cdevsw = { - wfdopen, wfdclose, physread, physwrite, - wfdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wfdstrategy, "wfd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 }; + /* open */ wfdopen, + /* close */ wfdclose, + /* 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 +}; int wfdattach(struct atapi*, int, struct atapi_params*, int); diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c index 67af5399b401b..82832d41349b8 100644 --- a/sys/i386/isa/wst.c +++ b/sys/i386/isa/wst.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wst.c,v 1.20 1999/05/06 18:50:10 peter Exp $ + * $Id: wst.c,v 1.21 1999/05/07 07:03:32 phk Exp $ */ #include "wdc.h" @@ -59,10 +59,26 @@ static d_strategy_t wststrategy; static struct cdevsw wst_cdevsw = { - wstopen, wstclose, physread, physwrite, - wstioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wststrategy, "wst", - NULL, -1 }; + /* open */ wstopen, + /* close */ wstclose, + /* 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 */ BDEV_MAJOR +}; static unsigned int wst_total = 0; diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index 40ee9a88ee6af..650cc0b57eebb 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -20,7 +20,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wt.c,v 1.49 1999/05/06 18:44:11 peter Exp $ + * $Id: wt.c,v 1.50 1999/05/07 07:03:33 phk Exp $ * */ @@ -194,10 +194,26 @@ static d_strategy_t wtstrategy; static struct cdevsw wt_cdevsw = { - wtopen, wtclose, physread, physwrite, - wtioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wtstrategy, "wt", - NULL, -1 }; + /* open */ wtopen, + /* close */ wtclose, + /* 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 */ BDEV_MAJOR +}; /* diff --git a/sys/isa/fd.c b/sys/isa/fd.c index cc51f9338364e..cd7001be81516 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.143 1999/05/11 04:58:30 bde Exp $ + * $Id: fd.c,v 1.144 1999/05/30 11:10:54 dfr Exp $ * */ @@ -370,16 +370,31 @@ static d_close_t fdclose; static d_ioctl_t fdioctl; static d_strategy_t fdstrategy; -static struct cdevsw fd_cdevsw = { - Fdopen, fdclose, physread, physwrite, - fdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, fdstrategy, "fd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 -}; #define CDEV_MAJOR 9 #define BDEV_MAJOR 2 +static struct cdevsw fd_cdevsw = { + /* open */ Fdopen, + /* close */ fdclose, + /* 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 +}; + static int fdc_err(struct fdc_data *fdc, const char *s) { diff --git a/sys/isa/joy.c b/sys/isa/joy.c index 5d4a7c2330604..6847f43d41222 100644 --- a/sys/isa/joy.c +++ b/sys/isa/joy.c @@ -92,10 +92,27 @@ static d_close_t joyclose; static d_read_t joyread; static d_ioctl_t joyioctl; -static struct cdevsw joy_cdevsw = - { joyopen, joyclose, joyread, nowrite, /*51*/ - joyioctl, nostop, nullreset, nodevtotty,/*joystick */ - seltrue, nommap, NULL, "joy", NULL, -1 }; +static struct cdevsw joy_cdevsw = { + /* open */ joyopen, + /* close */ joyclose, + /* 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 +}; static int get_tick __P((void)); diff --git a/sys/isa/psm.c b/sys/isa/psm.c index a520b65797afc..1d1589c7bbd0f 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.8 1999/05/09 04:58:35 yokota Exp $ + * $Id: psm.c,v 1.9 1999/05/09 13:00:43 phk Exp $ */ /* @@ -315,10 +315,26 @@ static driver_t psm_driver = { #define CDEV_MAJOR 21 -static struct cdevsw psm_cdevsw = { - psmopen, psmclose, psmread, nowrite, /* 21 */ - psmioctl, nostop, nullreset, nodevtotty, - psmpoll, nommap, NULL, "psm", NULL, -1 +static struct cdevsw psm_cdevsw = { + /* open */ psmopen, + /* close */ psmclose, + /* 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 }; /* debug message level */ diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 4439ed2108c8d..c0a33cde32c8b 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.243 1999/05/28 09:37:11 dfr Exp $ + * $Id: sio.c,v 1.244 1999/05/30 11:14:39 dfr Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -361,12 +361,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; int comconsole = -1; diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c index d95bce7253c6d..07bffa8f74318 100644 --- a/sys/isa/vga_isa.c +++ b/sys/isa/vga_isa.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: vga_isa.c,v 1.8 1999/05/09 16:39:24 peter Exp $ + * $Id: vga_isa.c,v 1.9 1999/05/30 11:12:30 dfr Exp $ */ #include "vga.h" @@ -100,11 +100,26 @@ static d_close_t isavgaclose; static d_read_t isavgaread; static d_ioctl_t isavgaioctl; -static struct cdevsw vga_cdevsw = { - isavgaopen, isavgaclose, noread, nowrite, /* ?? */ - isavgaioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, NULL, DRIVER_NAME, - NULL, -1, nodump, nopsize, +static struct cdevsw vga_cdevsw = { + /* open */ isavgaopen, + /* close */ isavgaclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ isavgaioctl, + /* 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 }; #endif /* FB_INSTALL_CDEV */ diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2609d15453fdb..11d53053b0cfd 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.60 1999/05/03 23:57:20 billf Exp $ + * $Id: kern_descrip.c,v 1.61 1999/05/11 19:54:28 phk Exp $ */ #include "opt_compat.h" @@ -78,10 +78,27 @@ static d_open_t fdopen; #define NUMFDESC 64 #define CDEV_MAJOR 22 -static struct cdevsw fildesc_cdevsw = - { fdopen, noclose, noread, nowrite, - noioc, nostop, nullreset, nodevtotty, - seltrue, nommap, nostrat, "FD" }; +static struct cdevsw fildesc_cdevsw = { + /* open */ fdopen, + /* close */ noclose, + /* 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 +}; static int finishdup __P((struct filedesc *fdp, int old, int new, register_t *retval)); /* diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index c33d6bbbd58f6..67a7d6555ccbe 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 - * $Id: subr_log.c,v 1.33 1998/12/07 21:58:29 archie Exp $ + * $Id: subr_log.c,v 1.34 1999/05/06 18:12:46 peter Exp $ */ /* @@ -68,10 +68,27 @@ static d_ioctl_t logioctl; static d_poll_t logpoll; #define CDEV_MAJOR 7 -static struct cdevsw log_cdevsw = - { logopen, logclose, logread, nowrite, /*7*/ - logioctl, nostop, nullreset, nodevtotty,/* klog */ - logpoll, nommap, NULL, "log", NULL, -1 }; +static struct cdevsw log_cdevsw = { + /* open */ logopen, + /* close */ logclose, + /* 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 +}; static struct logsoftc { int sc_state; /* see above for possibilities */ diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 32b181ddd5271..6b7efb4d56f1e 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.64 1999/04/28 10:52:04 dt Exp $ + * $Id: cons.c,v 1.65 1999/05/08 06:39:20 phk Exp $ */ #include "opt_devfs.h" @@ -65,12 +65,26 @@ static d_ioctl_t cnioctl; static d_poll_t cnpoll; #define CDEV_MAJOR 0 -static struct cdevsw cn_cdevsw = { - cnopen, cnclose, cnread, cnwrite, - cnioctl, nullstop, nullreset, nodevtotty, - cnpoll, nommap, NULL, "console", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw cn_cdevsw = { + /* open */ cnopen, + /* close */ cnclose, + /* 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 }; static dev_t cn_dev_t; /* seems to be never really used */ diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 87f21f00de488..535df84a923c1 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.4 (Berkeley) 2/20/95 - * $Id: tty_pty.c,v 1.58 1999/05/14 20:44:20 luoqi Exp $ + * $Id: tty_pty.c,v 1.59 1999/05/18 14:53:52 luoqi Exp $ */ /* @@ -80,21 +80,49 @@ static d_write_t ptcwrite; static d_poll_t ptcpoll; #define CDEV_MAJOR_S 5 -static struct cdevsw pts_cdevsw = { - ptsopen, ptsclose, ptsread, ptswrite, - ptyioctl, ptsstop, nullreset, ptydevtotty, - ttpoll, nommap, NULL, "pts", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw pts_cdevsw = { + /* open */ ptsopen, + /* close */ ptsclose, + /* read */ ptsread, + /* write */ ptswrite, + /* ioctl */ ptyioctl, + /* stop */ ptsstop, + /* reset */ noreset, + /* devtotty */ ptydevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "pts", + /* parms */ noparms, + /* maj */ CDEV_MAJOR_S, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; #define CDEV_MAJOR_C 6 -static struct cdevsw ptc_cdevsw = { - ptcopen, ptcclose, ptcread, ptcwrite, - ptyioctl, nullstop, nullreset, ptydevtotty, - ptcpoll, nommap, NULL, "ptc", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw ptc_cdevsw = { + /* open */ ptcopen, + /* close */ ptcclose, + /* read */ ptcread, + /* write */ ptcwrite, + /* ioctl */ ptyioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ ptydevtotty, + /* 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 }; #if NPTY == 1 diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index 1018083b5315e..8b45c8aca9630 100644 --- a/sys/kern/tty_snoop.c +++ b/sys/kern/tty_snoop.c @@ -46,10 +46,27 @@ static d_ioctl_t snpioctl; static d_poll_t snppoll; #define CDEV_MAJOR 53 -static struct cdevsw snp_cdevsw = - { snpopen, snpclose, snpread, snpwrite, /*53*/ - snpioctl, nostop, nullreset, nodevtotty,/* snoop */ - snppoll, nommap, NULL, "snp", NULL, -1 }; +static struct cdevsw snp_cdevsw = { + /* open */ snpopen, + /* close */ snpclose, + /* 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 +}; #ifndef MIN diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index 889c93503359c..693387d55b1ee 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_tty.c,v 1.24 1998/06/07 17:11:44 dfr Exp $ + * $Id: tty_tty.c,v 1.25 1998/08/23 08:26:42 bde Exp $ */ /* @@ -60,12 +60,26 @@ static d_poll_t cttypoll; #define CDEV_MAJOR 1 /* Don't make this static, since fdesc_vnops uses it. */ -struct cdevsw ctty_cdevsw = { - cttyopen, nullclose, cttyread, cttywrite, - cttyioctl, nullstop, nullreset, nodevtotty, - cttypoll, nommap, NULL, "ctty", - NULL, -1, nodump, nopsize, - D_TTY, +struct cdevsw ctty_cdevsw = { + /* open */ cttyopen, + /* close */ nullclose, + /* 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 }; #define cttyvp(p) ((p)->p_flag & P_CONTROLT ? (p)->p_session->s_ttyvp : NULL) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 5b6dd2f2f6419..40d3609759989 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -37,7 +37,7 @@ * * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * - * $Id: bpf.c,v 1.48 1999/04/28 01:18:13 msmith Exp $ + * $Id: bpf.c,v 1.49 1999/04/28 11:37:30 phk Exp $ */ #include "bpfilter.h" @@ -141,10 +141,27 @@ static d_ioctl_t bpfioctl; static d_poll_t bpfpoll; #define CDEV_MAJOR 23 -static struct cdevsw bpf_cdevsw = - { bpfopen, bpfclose, bpfread, bpfwrite, /*23*/ - bpfioctl, nostop, nullreset, nodevtotty,/* bpf */ - bpfpoll, nommap, NULL, "bpf", NULL, -1 }; +static struct cdevsw bpf_cdevsw = { + /* open */ bpfopen, + /* close */ bpfclose, + /* 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 +}; static int diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index e5539491824ea..071e628dd0804 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -85,9 +85,25 @@ static d_poll_t tunpoll; #define CDEV_MAJOR 52 static struct cdevsw tun_cdevsw = { - tunopen, tunclose, tunread, tunwrite, - tunioctl, nullstop, noreset, nodevtotty, - tunpoll, nommap, nostrategy, "tun", NULL, -1 + /* open */ tunopen, + /* close */ tunclose, + /* 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 27111293077a4..014220998f9dd 100644 --- a/sys/netinet/mlf_ipl.c +++ b/sys/netinet/mlf_ipl.c @@ -131,8 +131,8 @@ static void *ipf_devfs[IPL_LOGMAX + 1]; #if !defined(__FreeBSD_version) || (__FreeBSD_version < 220000) int ipl_major = 0; -static struct cdevsw ipldevsw = -{ +static struct cdevsw ipldevsw += { iplopen, /* open */ iplclose, /* close */ iplread, /* read */ @@ -154,10 +154,25 @@ extern int nchrdev; #else static struct cdevsw ipl_cdevsw = { - iplopen, iplclose, iplread, nowrite, /* 79 */ - iplioctl, nostop, noreset, nodevtotty, - seltrue, nommap, nostrategy, "ipl", - NULL, -1 + /* open */ iplopen, + /* close */ iplclose, + /* read */ iplread, + /* write */ nowrite, + /* ioctl */ iplioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "ipl", + /* parms */ noparms, + /* maj */ -1, + /* 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 2787b906de517..b08d6890ba65a 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.60 1999/05/09 04:34:28 kato Exp $ + * $Id: fd.c,v 1.61 1999/05/11 08:37:16 kato Exp $ * */ @@ -466,16 +466,31 @@ static d_close_t fdclose; static d_ioctl_t fdioctl; static d_strategy_t fdstrategy; -static struct cdevsw fd_cdevsw = { - Fdopen, fdclose, physread, physwrite, - fdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, fdstrategy, "fd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 -}; #define CDEV_MAJOR 9 #define BDEV_MAJOR 2 +static struct cdevsw fd_cdevsw = { + /* open */ Fdopen, + /* close */ fdclose, + /* 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 +}; + static int fdc_err(struct fdc_data *fdc, const char *s) { diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index 3226900652a2c..a6efd2aedabd0 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pc98gdc.c,v 1.7 1999/04/18 14:42:18 kato Exp $ + * $Id: pc98gdc.c,v 1.8 1999/05/09 04:56:42 kato Exp $ */ #include "gdc.h" @@ -101,11 +101,26 @@ static d_close_t gdcclose; static d_read_t gdcread; static d_ioctl_t gdcioctl; -static struct cdevsw vga_cdevsw = { - gdcopen, gdcclose, noread, nowrite, /* ?? */ - gdcioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, NULL, DRIVER_NAME, - NULL, -1, nodump, nopsize, +static struct cdevsw vga_cdevsw = { + /* open */ gdcopen, + /* close */ gdcclose, + /* read */ noread, + /* write */ nowrite, + /* 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 }; #endif /* FB_INSTALL_CDEV */ diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c index 38e0bc0942112..dff816258e559 100644 --- a/sys/pc98/cbus/pckbd.c +++ b/sys/pc98/cbus/pckbd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pc98kbd.c,v 1.6 1999/04/18 14:42:18 kato Exp $ + * $Id: pc98kbd.c,v 1.7 1999/05/09 04:53:58 kato Exp $ */ #include "pckbd.h" @@ -119,11 +119,26 @@ static d_read_t pckbdread; static d_ioctl_t pckbdioctl; static d_poll_t pckbdpoll; -static struct cdevsw pckbd_cdevsw = { - pckbdopen, pckbdclose, pckbdread, nowrite, - pckbdioctl, nostop, nullreset, nodevtotty, - pckbdpoll, nommap, NULL, DRIVER_NAME, - NULL, -1, +static struct cdevsw pckbd_cdevsw = { + /* open */ pckbdopen, + /* close */ pckbdclose, + /* read */ pckbdread, + /* write */ nowrite, + /* ioctl */ pckbdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ pckbdpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* KBD_INSTALL_CDEV */ diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index b71775b20210d..c09af65d35ca2 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.95 1999/05/10 09:37:37 kato Exp $ + * $Id: sio.c,v 1.96 1999/05/11 08:38:28 kato Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -481,12 +481,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; int comconsole = -1; diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index 2787b906de517..b08d6890ba65a 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.60 1999/05/09 04:34:28 kato Exp $ + * $Id: fd.c,v 1.61 1999/05/11 08:37:16 kato Exp $ * */ @@ -466,16 +466,31 @@ static d_close_t fdclose; static d_ioctl_t fdioctl; static d_strategy_t fdstrategy; -static struct cdevsw fd_cdevsw = { - Fdopen, fdclose, physread, physwrite, - fdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, fdstrategy, "fd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 -}; #define CDEV_MAJOR 9 #define BDEV_MAJOR 2 +static struct cdevsw fd_cdevsw = { + /* open */ Fdopen, + /* close */ fdclose, + /* 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 +}; + static int fdc_err(struct fdc_data *fdc, const char *s) { diff --git a/sys/pc98/pc98/lpt.c b/sys/pc98/pc98/lpt.c index a8c249ceb55d5..51999ab6cf884 100644 --- a/sys/pc98/pc98/lpt.c +++ b/sys/pc98/pc98/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.25 1999/01/28 11:24:36 kato Exp $ + * $Id: lpt.c,v 1.26 1999/04/28 10:53:53 dt Exp $ */ /* @@ -308,10 +308,27 @@ static d_write_t lptwrite; static d_ioctl_t lptioctl; #define CDEV_MAJOR 16 -static struct cdevsw lpt_cdevsw = - { lptopen, lptclose, noread, lptwrite, /*16*/ - lptioctl, nullstop, nullreset, nodevtotty,/* lpt */ - seltrue, nommap, nostrat, "lpt", NULL, -1 }; +static struct cdevsw lpt_cdevsw = { + /* open */ lptopen, + /* close */ lptclose, + /* 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 +}; #ifndef PC98 /* diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c index 8d89a40955382..596b10c1ca757 100644 --- a/sys/pc98/pc98/mse.c +++ b/sys/pc98/pc98/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.19 1999/04/28 10:53:55 dt Exp $ + * $Id: mse.c,v 1.20 1999/05/09 04:37:17 kato Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -83,10 +83,27 @@ static d_ioctl_t mseioctl; static d_poll_t msepoll; #define CDEV_MAJOR 27 -static struct cdevsw mse_cdevsw = - { mseopen, mseclose, mseread, nowrite, /*27*/ - mseioctl, nostop, nullreset, nodevtotty,/* mse */ - msepoll, nommap, NULL, "mse", NULL, -1 }; +static struct cdevsw mse_cdevsw = { + /* open */ mseopen, + /* close */ mseclose, + /* 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 +}; static ointhand2_t mseintr; diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c index 3226900652a2c..a6efd2aedabd0 100644 --- a/sys/pc98/pc98/pc98gdc.c +++ b/sys/pc98/pc98/pc98gdc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pc98gdc.c,v 1.7 1999/04/18 14:42:18 kato Exp $ + * $Id: pc98gdc.c,v 1.8 1999/05/09 04:56:42 kato Exp $ */ #include "gdc.h" @@ -101,11 +101,26 @@ static d_close_t gdcclose; static d_read_t gdcread; static d_ioctl_t gdcioctl; -static struct cdevsw vga_cdevsw = { - gdcopen, gdcclose, noread, nowrite, /* ?? */ - gdcioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, NULL, DRIVER_NAME, - NULL, -1, nodump, nopsize, +static struct cdevsw vga_cdevsw = { + /* open */ gdcopen, + /* close */ gdcclose, + /* read */ noread, + /* write */ nowrite, + /* 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 }; #endif /* FB_INSTALL_CDEV */ diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c index 38e0bc0942112..dff816258e559 100644 --- a/sys/pc98/pc98/pc98kbd.c +++ b/sys/pc98/pc98/pc98kbd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pc98kbd.c,v 1.6 1999/04/18 14:42:18 kato Exp $ + * $Id: pc98kbd.c,v 1.7 1999/05/09 04:53:58 kato Exp $ */ #include "pckbd.h" @@ -119,11 +119,26 @@ static d_read_t pckbdread; static d_ioctl_t pckbdioctl; static d_poll_t pckbdpoll; -static struct cdevsw pckbd_cdevsw = { - pckbdopen, pckbdclose, pckbdread, nowrite, - pckbdioctl, nostop, nullreset, nodevtotty, - pckbdpoll, nommap, NULL, DRIVER_NAME, - NULL, -1, +static struct cdevsw pckbd_cdevsw = { + /* open */ pckbdopen, + /* close */ pckbdclose, + /* read */ pckbdread, + /* write */ nowrite, + /* ioctl */ pckbdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ pckbdpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* KBD_INSTALL_CDEV */ diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c index 43caf09b0c033..ee06ce20c464c 100644 --- a/sys/pc98/pc98/pcaudio.c +++ b/sys/pc98/pc98/pcaudio.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcaudio.c,v 1.21 1999/04/28 10:53:57 dt Exp $ + * $Id: pcaudio.c,v 1.22 1999/05/09 04:39:36 kato Exp $ */ #include "pca.h" @@ -145,10 +145,27 @@ static d_ioctl_t pcaioctl; static d_poll_t pcapoll; #define CDEV_MAJOR 24 -static struct cdevsw pca_cdevsw = - { pcaopen, pcaclose, noread, pcawrite, /*24*/ - pcaioctl, nostop, nullreset, nodevtotty,/* pcaudio */ - pcapoll, nommap, NULL, "pca", NULL, -1 }; +static struct cdevsw pca_cdevsw = { + /* open */ pcaopen, + /* close */ pcaclose, + /* 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 +}; static void pca_continue __P((void)); static void pca_init __P((void)); diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index b71775b20210d..c09af65d35ca2 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.95 1999/05/10 09:37:37 kato Exp $ + * $Id: sio.c,v 1.96 1999/05/11 08:38:28 kato Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -481,12 +481,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; int comconsole = -1; diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c index 4121a17cf958d..f10611369ff02 100644 --- a/sys/pc98/pc98/spkr.c +++ b/sys/pc98/pc98/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.13 1998/06/08 08:55:45 kato Exp $ + * $Id: spkr.c,v 1.14 1998/08/28 12:47:45 kato Exp $ */ /* @@ -43,10 +43,27 @@ static d_write_t spkrwrite; static d_ioctl_t spkrioctl; #define CDEV_MAJOR 26 -static struct cdevsw spkr_cdevsw = - { spkropen, spkrclose, noread, spkrwrite, /*26*/ - spkrioctl, nostop, nullreset, nodevtotty,/* spkr */ - seltrue, nommap, NULL, "spkr", NULL, -1 }; +static struct cdevsw spkr_cdevsw = { + /* open */ spkropen, + /* close */ spkrclose, + /* 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 +}; /**************** MACHINE DEPENDENT PART STARTS HERE ************************* * diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c index 459968dff6931..fa8119abb256f 100644 --- a/sys/pc98/pc98/syscons.c +++ b/sys/pc98/pc98/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.117 1999/04/27 11:18:04 phk Exp $ + * $Id: syscons.c,v 1.118 1999/05/09 05:02:26 kato Exp $ */ #include "sc.h" @@ -383,12 +383,26 @@ static d_ioctl_t scioctl; static d_mmap_t scmmap; #define CDEV_MAJOR 12 -static struct cdevsw sc_cdevsw = { - scopen, scclose, scread, scwrite, - scioctl, nullstop, noreset, scdevtotty, - ttpoll, scmmap, nostrategy, "sc", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sc_cdevsw = { + /* open */ scopen, + /* close */ scclose, + /* read */ scread, + /* write */ scwrite, + /* ioctl */ scioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ scdevtotty, + /* poll */ ttpoll, + /* mmap */ scmmap, + /* strategy */ nostrategy, + /* name */ "sc", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; #ifdef PC98 diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 5ea452da910fa..ebecceb218fa1 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.81 1999/05/09 04:42:10 kato Exp $ + * $Id: wd.c,v 1.82 1999/05/25 10:41:14 kato Exp $ */ /* TODO: @@ -267,14 +267,27 @@ static d_psize_t wdsize; #define CDEV_MAJOR 3 #define BDEV_MAJOR 0 - static struct cdevsw wd_cdevsw = { - wdopen, wdclose, physread, physwrite, - wdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wdstrategy, "wd", - NULL, -1, wddump, wdsize, - D_DISK, 0, -1 }; - + /* open */ wdopen, + /* close */ wdclose, + /* 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 +}; static int atapictrlr; static int eide_quirks; diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c index 99333d472725c..644fb3f4713a6 100644 --- a/sys/pc98/pc98/wd_cd.c +++ b/sys/pc98/pc98/wd_cd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-cd.c,v 1.17 1999/05/07 07:03:23 phk Exp $ + * $Id: atapi-cd.c,v 1.18 1999/05/11 10:39:27 sos Exp $ */ #include "wdc.h" @@ -61,11 +61,25 @@ static d_strategy_t acdstrategy; #define CDEV_MAJOR 69 #define BDEV_MAJOR 19 static struct cdevsw acd_cdevsw = { - acdopen, acdclose, physread, physwrite, - acdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, acdstrategy, "wcd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 + /* open */ acdopen, + /* close */ acdclose, + /* 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 }; #define NUNIT 16 /* Max # of devices */ diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c index 8aa5e11feb378..d03a2014edacd 100644 --- a/sys/pc98/pc98/wfd.c +++ b/sys/pc98/pc98/wfd.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wfd.c,v 1.22 1999/04/28 10:53:04 dt Exp $ + * $Id: wfd.c,v 1.23 1999/05/07 07:03:31 phk Exp $ */ /* @@ -61,11 +61,26 @@ static d_strategy_t wfdstrategy; #define BDEV_MAJOR 1 static struct cdevsw wfd_cdevsw = { - wfdopen, wfdclose, physread, physwrite, - wfdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wfdstrategy, "wfd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 }; + /* open */ wfdopen, + /* close */ wfdclose, + /* 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 +}; int wfdattach(struct atapi*, int, struct atapi_params*, int); diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c index 67af5399b401b..82832d41349b8 100644 --- a/sys/pc98/pc98/wst.c +++ b/sys/pc98/pc98/wst.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wst.c,v 1.20 1999/05/06 18:50:10 peter Exp $ + * $Id: wst.c,v 1.21 1999/05/07 07:03:32 phk Exp $ */ #include "wdc.h" @@ -59,10 +59,26 @@ static d_strategy_t wststrategy; static struct cdevsw wst_cdevsw = { - wstopen, wstclose, physread, physwrite, - wstioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wststrategy, "wst", - NULL, -1 }; + /* open */ wstopen, + /* close */ wstclose, + /* 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 */ BDEV_MAJOR +}; static unsigned int wst_total = 0; diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 2d317f582a834..100f7f583ba19 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pccard.c,v 1.77 1999/05/02 04:19:27 nate Exp $ + * $Id: pccard.c,v 1.78 1999/05/04 15:43:02 wpaul Exp $ */ #include "opt_devfs.h" @@ -138,10 +138,27 @@ static d_ioctl_t crdioctl; static d_poll_t crdpoll; #define CDEV_MAJOR 50 -static struct cdevsw crd_cdevsw = - { crdopen, crdclose, crdread, crdwrite, /*50*/ - crdioctl, nostop, nullreset, nodevtotty,/* pcmcia */ - crdpoll, nommap, NULL, "crd", NULL, -1 }; +static struct cdevsw crd_cdevsw = { + /* open */ crdopen, + /* close */ crdclose, + /* 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/brooktree848.c b/sys/pci/brooktree848.c index 67b2eb2e1f882..70d3367dfa01a 100644 --- a/sys/pci/brooktree848.c +++ b/sys/pci/brooktree848.c @@ -1,4 +1,4 @@ -/* $Id: brooktree848.c,v 1.80 1999/05/23 21:40:51 roger Exp $ */ +/* $Id: brooktree848.c,v 1.81 1999/05/25 12:43:40 roger Exp $ */ /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and Jim Lowe's driver for the Matrox Meteor PCI card . The @@ -600,12 +600,26 @@ static d_ioctl_t bktr_ioctl; static d_mmap_t bktr_mmap; #define CDEV_MAJOR 92 -static struct cdevsw bktr_cdevsw = -{ - bktr_open, bktr_close, bktr_read, bktr_write, - bktr_ioctl, nostop, nullreset, nodevtotty, - seltrue, bktr_mmap, NULL, "bktr", - NULL, -1 +static struct cdevsw bktr_cdevsw = { + /* open */ bktr_open, + /* close */ bktr_close, + /* read */ bktr_read, + /* write */ bktr_write, + /* ioctl */ bktr_ioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ bktr_mmap, + /* strategy */ nostrategy, + /* name */ "bktr", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* __FreeBSD__ */ diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index 90157d23cc297..ca50c9a162d03 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -228,10 +228,27 @@ static d_ioctl_t meteor_ioctl; static d_mmap_t meteor_mmap; #define CDEV_MAJOR 67 -static struct cdevsw meteor_cdevsw = - { meteor_open, meteor_close, meteor_read, meteor_write, /*67*/ - meteor_ioctl, nostop, nullreset, nodevtotty,/* Meteor */ - seltrue, meteor_mmap, NULL, "meteor", NULL, -1 }; +static struct cdevsw meteor_cdevsw = { + /* open */ meteor_open, + /* close */ meteor_close, + /* 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 static mreg_t saa7116_pci_default[sizeof(struct saa7116_regs)/sizeof(mreg_t)]={ diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 552e2024c382b..bf5e65761909a 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pci.c,v 1.104 1999/05/20 15:33:31 gallatin Exp $ + * $Id: pci.c,v 1.105 1999/05/30 10:54:31 dfr Exp $ * */ @@ -847,8 +847,25 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) #define PCI_CDEV 78 static struct cdevsw pcicdev = { - pci_open, pci_close, noread, nowrite, pci_ioctl, nostop, noreset, - nodevtotty, seltrue, nommap, nostrategy, "pci", 0, PCI_CDEV + /* open */ pci_open, + /* close */ pci_close, + /* 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 }; #ifdef DEVFS diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c index 26c9bd5064f51..309deb034eff9 100644 --- a/sys/pci/xrpu.c +++ b/sys/pci/xrpu.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: xrpu.c,v 1.9 1999/04/24 20:14:03 peter Exp $ + * $Id: xrpu.c,v 1.10 1999/05/09 17:07:12 peter Exp $ * * A very simple device driver for PCI cards based on Xilinx 6200 series * FPGA/RPU devices. Current Functionality is to allow you to open and @@ -49,11 +49,26 @@ static d_ioctl_t xrpu_ioctl; static d_mmap_t xrpu_mmap; #define CDEV_MAJOR 100 -static struct cdevsw xrpudevsw = { - xrpu_open, xrpu_close, noread, nowrite, - xrpu_ioctl, nullstop, noreset, nodevtotty, - seltrue, xrpu_mmap, nostrategy, "xrpu", - NULL, -1 +static struct cdevsw xrpu_cdevsw = { + /* open */ xrpu_open, + /* close */ xrpu_close, + /* 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 }; static MALLOC_DEFINE(M_XRPU, "xrpu", "XRPU related"); @@ -164,7 +179,7 @@ xrpu_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *pr) && xt->xt_pps[i].xt_addr_clear == 0) continue; #ifdef DEVFS - devfs_add_devswf(&xrpudevsw, (i+1)<<16, DV_CHR, UID_ROOT, GID_WHEEL, + devfs_add_devswf(&xrpu_cdevsw, (i+1)<<16, DV_CHR, UID_ROOT, GID_WHEEL, 0600, "xpps%d", i); #endif sc->pps[i].ppscap = 0; @@ -239,10 +254,10 @@ xrpu_attach (pcici_t tag, int unit) (u_long)sc->physbase, (u_long)sc->virbase); if (!unit) - cdevsw_add(&cdev, &xrpudevsw, NULL); + cdevsw_add(&cdev, &xrpu_cdevsw, NULL); #ifdef DEVFS - devfs_add_devswf(&xrpudevsw, 0, DV_CHR, UID_ROOT, GID_WHEEL, 0600, + devfs_add_devswf(&xrpu_cdevsw, 0, DV_CHR, UID_ROOT, GID_WHEEL, 0600, "xrpu%d", unit); #endif } diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 38c95a7c10fa6..a5d037be63d89 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.5 (Berkeley) 1/9/95 - * $Id: conf.h,v 1.55 1999/05/11 19:54:54 phk Exp $ + * $Id: conf.h,v 1.56 1999/05/12 22:33:08 peter Exp $ */ #ifndef _SYS_CONF_H_ @@ -112,7 +112,7 @@ struct cdevsw { d_write_t *d_write; d_ioctl_t *d_ioctl; d_stop_t *d_stop; - d_reset_t *d_reset; /* XXX not used */ + d_reset_t *d_bogoreset; /* XXX not used */ d_devtotty_t *d_devtotty; d_poll_t *d_poll; d_mmap_t *d_mmap; @@ -208,16 +208,9 @@ d_stop_t nostop; d_reset_t noreset; d_devtotty_t nodevtotty; d_mmap_t nommap; - -/* Bogus defines for compatibility. */ -#define noioc noioctl -#define nostrat nostrategy -#define zerosize nopsize -/* - * XXX d_strategy seems to be unused for cdevs that aren't associated with - * bdevs and called without checking for it being non-NULL for bdevs. - */ #define nostrategy ((d_strategy_t *)NULL) +#define noparms ((d_parms_t *)NULL) +#define nopoll seltrue d_dump_t nodump; @@ -228,8 +221,6 @@ d_dump_t nodump; d_open_t nullopen; d_close_t nullclose; -#define nullstop nostop /* one void return is as good as another */ -#define nullreset noreset /* one unused function is as good as another */ l_read_t l_noread; l_write_t l_nowrite; diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index 38c95a7c10fa6..a5d037be63d89 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.5 (Berkeley) 1/9/95 - * $Id: conf.h,v 1.55 1999/05/11 19:54:54 phk Exp $ + * $Id: conf.h,v 1.56 1999/05/12 22:33:08 peter Exp $ */ #ifndef _SYS_CONF_H_ @@ -112,7 +112,7 @@ struct cdevsw { d_write_t *d_write; d_ioctl_t *d_ioctl; d_stop_t *d_stop; - d_reset_t *d_reset; /* XXX not used */ + d_reset_t *d_bogoreset; /* XXX not used */ d_devtotty_t *d_devtotty; d_poll_t *d_poll; d_mmap_t *d_mmap; @@ -208,16 +208,9 @@ d_stop_t nostop; d_reset_t noreset; d_devtotty_t nodevtotty; d_mmap_t nommap; - -/* Bogus defines for compatibility. */ -#define noioc noioctl -#define nostrat nostrategy -#define zerosize nopsize -/* - * XXX d_strategy seems to be unused for cdevs that aren't associated with - * bdevs and called without checking for it being non-NULL for bdevs. - */ #define nostrategy ((d_strategy_t *)NULL) +#define noparms ((d_parms_t *)NULL) +#define nopoll seltrue d_dump_t nodump; @@ -228,8 +221,6 @@ d_dump_t nodump; d_open_t nullopen; d_close_t nullclose; -#define nullstop nostop /* one void return is as good as another */ -#define nullreset noreset /* one unused function is as good as another */ l_read_t l_noread; l_write_t l_nowrite; diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index eed1617d5a698..662f3bf1c1ba6 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.67 1999/05/09 17:28:00 phk Exp $ + * $Id: vm_swap.c,v 1.68 1999/05/12 11:05:23 phk Exp $ */ #include "opt_devfs.h" @@ -74,12 +74,27 @@ static d_strategy_t swstrategy; #define CDEV_MAJOR 4 #define BDEV_MAJOR 26 -static struct cdevsw sw_cdevsw = - { nullopen, nullclose, physread, physwrite, /*4*/ - noioc, nostop, noreset, nodevtotty,/* swap */ - seltrue, nommap, swstrategy, "sw", - NULL, -1, nodump, nopsize, - 0, 0, -1}; +static struct cdevsw sw_cdevsw = { + /* open */ nullopen, + /* close */ nullclose, + /* 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 +}; /* |