diff options
| author | dholland <dholland@NetBSD.org> | 2014-03-16 05:20:22 +0000 |
|---|---|---|
| committer | dholland <dholland@NetBSD.org> | 2014-03-16 05:20:22 +0000 |
| commit | 76258fa0fe68b72536361d37e7b733d8bb10b786 (patch) | |
| tree | e8334d8baca3ac8a5d20fc7647d104a782381607 /sys/dev | |
| parent | 1ccd73de606f245b810e292b6739d955a4f27d56 (diff) | |
Change (mostly mechanically) every cdevsw/bdevsw I can find to use
designated initializers.
I have not built every extant kernel so I have probably broken at
least one build; however I've also found and fixed some wrong
cdevsw/bdevsw entries so even if so I think we come out ahead.
Diffstat (limited to 'sys/dev')
138 files changed, 2028 insertions, 634 deletions
diff --git a/sys/dev/altmem/altmem.c b/sys/dev/altmem/altmem.c index 524130f26ba..7b47b38ecf8 100644 --- a/sys/dev/altmem/altmem.c +++ b/sys/dev/altmem/altmem.c @@ -1,4 +1,4 @@ -/* $NetBSD: altmem.c,v 1.1 2009/03/12 00:15:07 jmcneill Exp $ */ +/* $NetBSD: altmem.c,v 1.2 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca> @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.1 2009/03/12 00:15:07 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.2 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/types.h> #include <sys/device.h> @@ -60,12 +60,26 @@ static int altmem_match(device_t, cfdata_t, void *); static void altmem_attach(device_t, device_t, void *); const struct bdevsw altmem_bdevsw = { - altmemopen, altmemclose, altmemstrategy, altmemioctl, nodump, - altmemsize, D_DISK + .d_open = altmemopen, + .d_close = altmemclose, + .d_strategy = altmemstrategy, + .d_ioctl = altmemioctl, + .d_dump = nodump, + .d_psize = altmemsize, + .d_flag = D_DISK }; const struct cdevsw altmem_cdevsw = { - altmemopen, altmemclose, altmemread, altmemwrite, altmemioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = altmemopen, + .d_close = altmemclose, + .d_read = altmemread, + .d_write = altmemwrite, + .d_ioctl = altmemioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver altmemdkdriver = { altmemstrategy, minphys }; extern struct cfdriver altmem_cd; diff --git a/sys/dev/apm/apm.c b/sys/dev/apm/apm.c index ae01afa46b0..9d071352bd1 100644 --- a/sys/dev/apm/apm.c +++ b/sys/dev/apm/apm.c @@ -1,4 +1,4 @@ -/* $NetBSD: apm.c,v 1.29 2013/11/08 02:47:41 christos Exp $ */ +/* $NetBSD: apm.c,v 1.30 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.29 2013/11/08 02:47:41 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.30 2014/03/16 05:20:26 dholland Exp $"); #include "opt_apm.h" @@ -114,8 +114,17 @@ dev_type_poll(apmpoll); dev_type_kqfilter(apmkqfilter); const struct cdevsw apm_cdevsw = { - apmopen, apmclose, noread, nowrite, apmioctl, - nostop, notty, apmpoll, nommap, apmkqfilter, D_OTHER, + .d_open = apmopen, + .d_close = apmclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = apmioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = apmpoll, + .d_mmap = nommap, + .d_kqfilter = apmkqfilter, + .d_flag = D_OTHER, }; /* configurable variables */ diff --git a/sys/dev/arcbios/arcbios_tty.c b/sys/dev/arcbios/arcbios_tty.c index 8e0d26b4b6e..95d26685b64 100644 --- a/sys/dev/arcbios/arcbios_tty.c +++ b/sys/dev/arcbios/arcbios_tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: arcbios_tty.c,v 1.23 2013/12/16 15:49:00 mrg Exp $ */ +/* $NetBSD: arcbios_tty.c,v 1.24 2014/03/16 05:20:26 dholland Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: arcbios_tty.c,v 1.23 2013/12/16 15:49:00 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arcbios_tty.c,v 1.24 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/uio.h> @@ -64,9 +64,17 @@ dev_type_tty(arcbios_ttytty); dev_type_poll(arcbios_ttypoll); const struct cdevsw arcbios_cdevsw = { - arcbios_ttyopen, arcbios_ttyclose, arcbios_ttyread, arcbios_ttywrite, - arcbios_ttyioctl, arcbios_ttystop, arcbios_ttytty, arcbios_ttypoll, - nommap, ttykqfilter, D_TTY, + .d_open = arcbios_ttyopen, + .d_close = arcbios_ttyclose, + .d_read = arcbios_ttyread, + .d_write = arcbios_ttywrite, + .d_ioctl = arcbios_ttyioctl, + .d_stop = arcbios_ttystop, + .d_tty = arcbios_ttytty, + .d_poll = arcbios_ttypoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY, }; int diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c index 0509a47902a..a9df49239e7 100644 --- a/sys/dev/ata/ata.c +++ b/sys/dev/ata/ata.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata.c,v 1.129 2013/10/12 16:49:00 christos Exp $ */ +/* $NetBSD: ata.c,v 1.130 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.129 2013/10/12 16:49:00 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.130 2014/03/16 05:20:27 dholland Exp $"); #include "opt_ata.h" @@ -106,8 +106,17 @@ dev_type_close(atabusclose); dev_type_ioctl(atabusioctl); const struct cdevsw atabus_cdevsw = { - atabusopen, atabusclose, noread, nowrite, atabusioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = atabusopen, + .d_close = atabusclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = atabusioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver atabus_cd; diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 0298bf09ff7..5ba24f24393 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.406 2013/10/30 15:41:14 drochner Exp $ */ +/* $NetBSD: wd.c,v 1.407 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.406 2013/10/30 15:41:14 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.407 2014/03/16 05:20:27 dholland Exp $"); #include "opt_ata.h" @@ -142,12 +142,27 @@ dev_type_dump(wddump); dev_type_size(wdsize); const struct bdevsw wd_bdevsw = { - wdopen, wdclose, wdstrategy, wdioctl, wddump, wdsize, D_DISK + .d_open = wdopen, + .d_close = wdclose, + .d_strategy = wdstrategy, + .d_ioctl = wdioctl, + .d_dump = wddump, + .d_psize = wdsize, + .d_flag = D_DISK }; const struct cdevsw wd_cdevsw = { - wdopen, wdclose, wdread, wdwrite, wdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = wdopen, + .d_close = wdclose, + .d_read = wdread, + .d_write = wdwrite, + .d_ioctl = wdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; /* diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 4522ac98dbe..f262d608273 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.261 2012/04/30 02:16:46 mrg Exp $ */ +/* $NetBSD: audio.c,v 1.262 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -155,7 +155,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.261 2012/04/30 02:16:46 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.262 2014/03/16 05:20:26 dholland Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -349,8 +349,17 @@ dev_type_mmap(audiommap); dev_type_kqfilter(audiokqfilter); const struct cdevsw audio_cdevsw = { - audioopen, audioclose, audioread, audiowrite, audioioctl, - nostop, notty, audiopoll, audiommap, audiokqfilter, D_OTHER | D_MPSAFE + .d_open = audioopen, + .d_close = audioclose, + .d_read = audioread, + .d_write = audiowrite, + .d_ioctl = audioioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = audiopoll, + .d_mmap = audiommap, + .d_kqfilter = audiokqfilter, + .d_flag = D_OTHER | D_MPSAFE }; /* The default audio mode: 8 kHz mono mu-law */ diff --git a/sys/dev/bio.c b/sys/dev/bio.c index 9604670908c..02e989a4380 100644 --- a/sys/dev/bio.c +++ b/sys/dev/bio.c @@ -1,4 +1,4 @@ -/* $NetBSD: bio.c,v 1.9 2009/05/07 12:15:33 cegger Exp $ */ +/* $NetBSD: bio.c,v 1.10 2014/03/16 05:20:26 dholland Exp $ */ /* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */ /* @@ -28,7 +28,7 @@ /* A device controller ioctl tunnelling device. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.9 2009/05/07 12:15:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.10 2014/03/16 05:20:26 dholland Exp $"); #include "opt_compat_netbsd.h" @@ -68,8 +68,17 @@ static int bio_validate(void *); void bioattach(int); const struct cdevsw bio_cdevsw = { - bioopen, bioclose, noread, nowrite, bioioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER | D_MPSAFE + .d_open = bioopen, + .d_close = bioclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = bioioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER | D_MPSAFE }; diff --git a/sys/dev/bluetooth/bthub.c b/sys/dev/bluetooth/bthub.c index 241de8dea77..00d044ec2c1 100644 --- a/sys/dev/bluetooth/bthub.c +++ b/sys/dev/bluetooth/bthub.c @@ -1,4 +1,4 @@ -/* $NetBSD: bthub.c,v 1.18 2012/04/03 09:32:53 plunky Exp $ */ +/* $NetBSD: bthub.c,v 1.19 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.18 2012/04/03 09:32:53 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.19 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -70,8 +70,17 @@ CFATTACH_DECL_NEW(bthub, 0, dev_type_ioctl(bthubioctl); const struct cdevsw bthub_cdevsw = { - nullopen, nullclose, noread, nowrite, bthubioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = nullopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = bthubioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER, }; /* bthub functions */ diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c index 63f88aa3750..05340ebde48 100644 --- a/sys/dev/cgd.c +++ b/sys/dev/cgd.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgd.c,v 1.83 2013/12/28 19:25:07 pgoyette Exp $ */ +/* $NetBSD: cgd.c,v 1.84 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.83 2013/12/28 19:25:07 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.84 2014/03/16 05:20:26 dholland Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -69,13 +69,27 @@ static dev_type_dump(cgddump); static dev_type_size(cgdsize); const struct bdevsw cgd_bdevsw = { - cgdopen, cgdclose, cgdstrategy, cgdioctl, - cgddump, cgdsize, D_DISK + .d_open = cgdopen, + .d_close = cgdclose, + .d_strategy = cgdstrategy, + .d_ioctl = cgdioctl, + .d_dump = cgddump, + .d_psize = cgdsize, + .d_flag = D_DISK }; const struct cdevsw cgd_cdevsw = { - cgdopen, cgdclose, cgdread, cgdwrite, cgdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = cgdopen, + .d_close = cgdclose, + .d_read = cgdread, + .d_write = cgdwrite, + .d_ioctl = cgdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static int cgd_match(device_t, cfdata_t, void *); diff --git a/sys/dev/clockctl.c b/sys/dev/clockctl.c index 0d52f72e576..9c3745e69fa 100644 --- a/sys/dev/clockctl.c +++ b/sys/dev/clockctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: clockctl.c,v 1.30 2012/10/27 17:18:14 chs Exp $ */ +/* $NetBSD: clockctl.c,v 1.31 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.30 2012/10/27 17:18:14 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.31 2014/03/16 05:20:26 dholland Exp $"); #include "opt_ntp.h" #include "opt_compat_netbsd.h" @@ -57,8 +57,17 @@ __KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.30 2012/10/27 17:18:14 chs Exp $"); dev_type_ioctl(clockctlioctl); const struct cdevsw clockctl_cdevsw = { - nullopen, nullclose, noread, nowrite, clockctlioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = nullopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = clockctlioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER, }; static kauth_listener_t clockctl_listener; diff --git a/sys/dev/cons.c b/sys/dev/cons.c index a22de76abf4..649622cce3a 100644 --- a/sys/dev/cons.c +++ b/sys/dev/cons.c @@ -1,4 +1,4 @@ -/* $NetBSD: cons.c,v 1.70 2013/12/22 18:05:40 matt Exp $ */ +/* $NetBSD: cons.c,v 1.71 2014/03/16 05:20:26 dholland Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.70 2013/12/22 18:05:40 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.71 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -67,8 +67,17 @@ dev_type_kqfilter(cnkqfilter); static bool cn_redirect(dev_t *, int, int *); const struct cdevsw cons_cdevsw = { - cnopen, cnclose, cnread, cnwrite, cnioctl, - nostop, notty, cnpoll, nommap, cnkqfilter, D_TTY + .d_open = cnopen, + .d_close = cnclose, + .d_read = cnread, + .d_write = cnwrite, + .d_ioctl = cnioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = cnpoll, + .d_mmap = nommap, + .d_kqfilter = cnkqfilter, + .d_flag = D_TTY }; struct tty *constty = NULL; /* virtual console output device */ diff --git a/sys/dev/dec/dz.c b/sys/dev/dec/dz.c index 4d9b6d27667..fd9e0de0985 100644 --- a/sys/dev/dec/dz.c +++ b/sys/dev/dec/dz.c @@ -1,4 +1,4 @@ -/* $NetBSD: dz.c,v 1.40 2011/04/24 16:26:59 rmind Exp $ */ +/* $NetBSD: dz.c,v 1.41 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.40 2011/04/24 16:26:59 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.41 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -187,8 +187,17 @@ static dev_type_tty(dztty); static dev_type_poll(dzpoll); const struct cdevsw dz_cdevsw = { - dzopen, dzclose, dzread, dzwrite, dzioctl, - dzstop, dztty, dzpoll, nommap, ttykqfilter, D_TTY + .d_open = dzopen, + .d_close = dzclose, + .d_read = dzread, + .d_write = dzwrite, + .d_ioctl = dzioctl, + .d_stop = dzstop, + .d_tty = dztty, + .d_poll = dzpoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; /* diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c index 41e17584d77..04dbec27e4a 100644 --- a/sys/dev/dkwedge/dk.c +++ b/sys/dev/dkwedge/dk.c @@ -1,4 +1,4 @@ -/* $NetBSD: dk.c,v 1.67 2013/08/03 18:30:57 soren Exp $ */ +/* $NetBSD: dk.c,v 1.68 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.67 2013/08/03 18:30:57 soren Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.68 2014/03/16 05:20:27 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_dkwedge.h" @@ -110,12 +110,27 @@ static dev_type_dump(dkdump); static dev_type_size(dksize); const struct bdevsw dk_bdevsw = { - dkopen, dkclose, dkstrategy, dkioctl, dkdump, dksize, D_DISK + .d_open = dkopen, + .d_close = dkclose, + .d_strategy = dkstrategy, + .d_ioctl = dkioctl, + .d_dump = dkdump, + .d_psize = dksize, + .d_flag = D_DISK }; const struct cdevsw dk_cdevsw = { - dkopen, dkclose, dkread, dkwrite, dkioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = dkopen, + .d_close = dkclose, + .d_read = dkread, + .d_write = dkwrite, + .d_ioctl = dkioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkwedge_softc **dkwedges; diff --git a/sys/dev/dmover/dmover_io.c b/sys/dev/dmover/dmover_io.c index 4dc756bef2a..cb3c16b8ac6 100644 --- a/sys/dev/dmover/dmover_io.c +++ b/sys/dev/dmover/dmover_io.c @@ -1,4 +1,4 @@ -/* $NetBSD: dmover_io.c,v 1.41 2013/07/25 04:32:37 msaitoh Exp $ */ +/* $NetBSD: dmover_io.c,v 1.42 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2002, 2003 Wasabi Systems, Inc. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.41 2013/07/25 04:32:37 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.42 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -133,9 +133,17 @@ void dmoverioattach(int); dev_type_open(dmoverioopen); const struct cdevsw dmoverio_cdevsw = { - dmoverioopen, noclose, noread, nowrite, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, - D_OTHER + .d_open = dmoverioopen, + .d_close = noclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* diff --git a/sys/dev/dtv/dtv_device.c b/sys/dev/dtv/dtv_device.c index 8c8ce70a369..4baf035fac6 100644 --- a/sys/dev/dtv/dtv_device.c +++ b/sys/dev/dtv/dtv_device.c @@ -1,4 +1,4 @@ -/* $NetBSD: dtv_device.c,v 1.8 2011/08/09 01:42:24 jmcneill Exp $ */ +/* $NetBSD: dtv_device.c,v 1.9 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dtv_device.c,v 1.8 2011/08/09 01:42:24 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dtv_device.c,v 1.9 2014/03/16 05:20:27 dholland Exp $"); #include <sys/types.h> #include <sys/conf.h> @@ -64,7 +64,7 @@ const struct cdevsw dtv_cdevsw = { .d_poll = dtvpoll, .d_mmap = nommap, .d_kqfilter = nokqfilter, - .d_flag = D_OTHER|D_MPSAFE, + .d_flag = D_OTHER | D_MPSAFE, }; static int dtv_match(device_t, cfdata_t, void *); diff --git a/sys/dev/filemon/filemon.c b/sys/dev/filemon/filemon.c index 706c81d3909..596bbe1a670 100644 --- a/sys/dev/filemon/filemon.c +++ b/sys/dev/filemon/filemon.c @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.5 2012/11/19 22:20:10 sjg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.6 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -51,7 +51,6 @@ static dev_type_open(filemon_open); struct cdevsw filemon_cdevsw = { .d_open = filemon_open, - .d_flag = D_MPSAFE, .d_close = noclose, .d_read = noread, .d_write = nowrite, @@ -61,6 +60,7 @@ struct cdevsw filemon_cdevsw = { .d_poll = nopoll, .d_mmap = nommap, .d_kqfilter = nokqfilter, + .d_flag = D_MPSAFE }; static int filemon_ioctl(struct file *, u_long, void *); diff --git a/sys/dev/fss.c b/sys/dev/fss.c index 079f03bd34d..91310956168 100644 --- a/sys/dev/fss.c +++ b/sys/dev/fss.c @@ -1,4 +1,4 @@ -/* $NetBSD: fss.c,v 1.87 2014/02/28 10:16:51 skrll Exp $ */ +/* $NetBSD: fss.c,v 1.88 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.87 2014/02/28 10:16:51 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.88 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -99,13 +99,26 @@ static struct vfs_hooks fss_vfs_hooks = { }; const struct bdevsw fss_bdevsw = { - fss_open, fss_close, fss_strategy, fss_ioctl, - fss_dump, fss_size, D_DISK | D_MPSAFE + .d_open = fss_open, + .d_close = fss_close, + .d_strategy = fss_strategy, fss_ioctl, + .d_dump = fss_dump, + .d_psize = fss_size, + .d_flag = D_DISK | D_MPSAFE }; const struct cdevsw fss_cdevsw = { - fss_open, fss_close, fss_read, fss_write, fss_ioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK | D_MPSAFE + .d_open = fss_open, + .d_close = fss_close, + .d_read = fss_read, + .d_write = fss_write, + .d_ioctl = fss_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK | D_MPSAFE }; static int fss_match(device_t, cfdata_t, void *); diff --git a/sys/dev/gpib/ct.c b/sys/dev/gpib/ct.c index 4702b3af440..5b998082938 100644 --- a/sys/dev/gpib/ct.c +++ b/sys/dev/gpib/ct.c @@ -1,4 +1,4 @@ -/* $NetBSD: ct.c,v 1.24 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: ct.c,v 1.25 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.24 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.25 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -181,12 +181,27 @@ dev_type_ioctl(ctioctl); dev_type_strategy(ctstrategy); const struct bdevsw ct_bdevsw = { - ctopen, ctclose, ctstrategy, ctioctl, nodump, nosize, D_TAPE + .d_open = ctopen, + .d_close = ctclose, + .d_strategy = ctstrategy, + .d_ioctl = ctioctl, + .d_dump = nodump, + .d_psize = nosize, + .d_flag = D_TAPE }; const struct cdevsw ct_cdevsw = { - ctopen, ctclose, ctread, ctwrite, ctioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_TAPE + .d_open = ctopen, + .d_close = ctclose, + .d_read = ctread, + .d_write = ctwrite, + .d_ioctl = ctioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_TAPE }; extern struct cfdriver ct_cd; diff --git a/sys/dev/gpib/gpib.c b/sys/dev/gpib/gpib.c index 371f80e32fb..8d23728af9d 100644 --- a/sys/dev/gpib/gpib.c +++ b/sys/dev/gpib/gpib.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpib.c,v 1.20 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: gpib.c,v 1.21 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.20 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.21 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,8 +78,17 @@ dev_type_ioctl(gpibioctl); dev_type_poll(gpibpoll); const struct cdevsw gpib_cdevsw = { - gpibopen, gpibclose, gpibread, gpibwrite, gpibioctl, - nostop, notty, gpibpoll, nommap, nokqfilter, D_OTHER + .d_open = gpibopen, + .d_close = gpibclose, + .d_read = gpibread, + .d_write = gpibwrite, + .d_ioctl = gpibioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = gpibpoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver gpib_cd; diff --git a/sys/dev/gpib/mt.c b/sys/dev/gpib/mt.c index 08e1860fdfa..cb2659ad9ca 100644 --- a/sys/dev/gpib/mt.c +++ b/sys/dev/gpib/mt.c @@ -1,4 +1,4 @@ -/* $NetBSD: mt.c,v 1.25 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: mt.c,v 1.26 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.25 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.26 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -161,12 +161,27 @@ dev_type_ioctl(mtioctl); dev_type_strategy(mtstrategy); const struct bdevsw mt_bdevsw = { - mtopen, mtclose, mtstrategy, mtioctl, nodump, nosize, D_TAPE + .d_open = mtopen, + .d_close = mtclose, + .d_strategy = mtstrategy, + .d_ioctl = mtioctl, + .d_dump = nodump, + .d_psize = nosize, + .d_flag = D_TAPE }; const struct cdevsw mt_cdevsw = { - mtopen, mtclose, mtread, mtwrite, mtioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_TAPE + .d_open = mtopen, + .d_close = mtclose, + .d_read = mtread, + .d_write = mtwrite, + .d_ioctl = mtioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_TAPE }; diff --git a/sys/dev/gpib/ppi.c b/sys/dev/gpib/ppi.c index c9c33bdaab9..6266b1e6930 100644 --- a/sys/dev/gpib/ppi.c +++ b/sys/dev/gpib/ppi.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppi.c,v 1.20 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: ppi.c,v 1.21 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.20 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.21 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -126,8 +126,17 @@ dev_type_write(ppiwrite); dev_type_ioctl(ppiioctl); const struct cdevsw ppi_cdevsw = { - ppiopen, ppiclose, ppiread, ppiwrite, ppiioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = ppiopen, + .d_close = ppiclose, + .d_read = ppiread, + .d_write = ppiwrite, + .d_ioctl = ppiioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; #define UNIT(x) minor(x) diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c index 946a7283256..f22c8d55f63 100644 --- a/sys/dev/gpib/rd.c +++ b/sys/dev/gpib/rd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.31 2012/10/27 17:18:16 chs Exp $ */ +/* $NetBSD: rd.c,v 1.32 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.31 2012/10/27 17:18:16 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.32 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -255,12 +255,27 @@ dev_type_dump(rddump); dev_type_size(rdsize); const struct bdevsw rd_bdevsw = { - rdopen, rdclose, rdstrategy, rdioctl, rddump, rdsize, D_DISK + .d_open = rdopen, + .d_close = rdclose, + .d_strategy = rdstrategy, + .d_ioctl = rdioctl, + .d_dump = rddump, + .d_psize = rdsize, + .d_flag = D_DISK }; const struct cdevsw rd_cdevsw = { - rdopen, rdclose, rdread, rdwrite, rdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = rdopen, + .d_close = rdclose, + .d_read = rdread, + .d_write = rdwrite, + .d_ioctl = rdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; extern struct cfdriver rd_cd; diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c index 4b6d37974a6..d891eb3d670 100644 --- a/sys/dev/gpio/gpio.c +++ b/sys/dev/gpio/gpio.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpio.c,v 1.52 2013/05/20 15:46:41 mbalmer Exp $ */ +/* $NetBSD: gpio.c,v 1.53 2014/03/16 05:20:27 dholland Exp $ */ /* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */ /* @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.52 2013/05/20 15:46:41 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.53 2014/03/16 05:20:27 dholland Exp $"); /* * General Purpose Input/Output framework. @@ -100,8 +100,17 @@ dev_type_ioctl(gpioioctl); dev_type_ioctl(gpioioctl_locked); const struct cdevsw gpio_cdevsw = { - gpioopen, gpioclose, noread, nowrite, gpioioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER | D_MPSAFE + .d_open = gpioopen, + .d_close = gpioclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = gpioioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER | D_MPSAFE }; extern struct cfdriver gpio_cd; diff --git a/sys/dev/hpc/apm/apmdev.c b/sys/dev/hpc/apm/apmdev.c index ac7453ca070..51ec61f9260 100644 --- a/sys/dev/hpc/apm/apmdev.c +++ b/sys/dev/hpc/apm/apmdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: apmdev.c,v 1.28 2013/11/09 02:44:52 christos Exp $ */ +/* $NetBSD: apmdev.c,v 1.29 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.28 2013/11/09 02:44:52 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.29 2014/03/16 05:20:27 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_apm.h" @@ -122,8 +122,17 @@ dev_type_poll(apmdevpoll); dev_type_kqfilter(apmdevkqfilter); const struct cdevsw apmdev_cdevsw = { - apmdevopen, apmdevclose, noread, nowrite, apmdevioctl, - nostop, notty, apmdevpoll, nommap, apmdevkqfilter, D_OTHER + .d_open = apmdevopen, + .d_close = apmdevclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = apmdevioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = apmdevpoll, + .d_mmap = nommap, + .d_kqfilter = apmdevkqfilter, + .d_flag = D_OTHER }; /* configurable variables */ diff --git a/sys/dev/hpc/biconsdev.c b/sys/dev/hpc/biconsdev.c index 4f6f0a63519..de3a569bf77 100644 --- a/sys/dev/hpc/biconsdev.c +++ b/sys/dev/hpc/biconsdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: biconsdev.c,v 1.20 2007/11/19 18:51:46 ad Exp $ */ +/* $NetBSD: biconsdev.c,v 1.21 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1999-2001 @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.20 2007/11/19 18:51:46 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.21 2014/03/16 05:20:27 dholland Exp $"); #include "biconsdev.h" #include <sys/param.h> @@ -96,9 +96,17 @@ dev_type_tty(biconsdevtty); dev_type_poll(biconsdevpoll); const struct cdevsw biconsdev_cdevsw = { - biconsdevopen, biconsdevclose, biconsdevread, biconsdevwrite, - biconsdevioctl, nostop, biconsdevtty, biconsdevpoll, nommap, - ttykqfilter, D_TTY + .d_open = biconsdevopen, + .d_close = biconsdevclose, + .d_read = biconsdevread, + .d_write = biconsdevwrite, + .d_ioctl = biconsdevioctl, + .d_stop = nostop, + .d_tty = biconsdevtty, + .d_poll = biconsdevpoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; void diff --git a/sys/dev/hpc/btnmgr.c b/sys/dev/hpc/btnmgr.c index 2eeae95c449..6ca07d642e0 100644 --- a/sys/dev/hpc/btnmgr.c +++ b/sys/dev/hpc/btnmgr.c @@ -1,4 +1,4 @@ -/* $NetBSD: btnmgr.c,v 1.26 2012/10/27 17:18:17 chs Exp $ */ +/* $NetBSD: btnmgr.c,v 1.27 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1999 @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.26 2012/10/27 17:18:17 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.27 2014/03/16 05:20:27 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_btnmgr.h" @@ -101,8 +101,17 @@ dev_type_write(btnmgrwrite); dev_type_ioctl(btnmgrioctl); const struct cdevsw btnmgr_cdevsw = { - btnmgropen, btnmgrclose, btnmgrread, btnmgrwrite, btnmgrioctl, - nostop, notty, nopoll, nommap, nokqfilter, + .d_open = btnmgropen, + .d_close = btnmgrclose, + .d_read = btnmgrread, + .d_write = btnmgrwrite, + .d_ioctl = btnmgrioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = 0 }; #endif /* notyet */ diff --git a/sys/dev/i2c/at24cxx.c b/sys/dev/i2c/at24cxx.c index 11f106d803b..988bf8959ca 100644 --- a/sys/dev/i2c/at24cxx.c +++ b/sys/dev/i2c/at24cxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: at24cxx.c,v 1.16 2013/10/25 14:32:10 jdc Exp $ */ +/* $NetBSD: at24cxx.c,v 1.17 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.16 2013/10/25 14:32:10 jdc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.17 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -94,8 +94,17 @@ dev_type_read(seeprom_read); dev_type_write(seeprom_write); const struct cdevsw seeprom_cdevsw = { - seeprom_open, seeprom_close, seeprom_read, seeprom_write, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = seeprom_open, + .d_close = seeprom_close, + .d_read = seeprom_read, + .d_write = seeprom_write, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static int seeprom_wait_idle(struct seeprom_softc *); diff --git a/sys/dev/i2c/ds1307.c b/sys/dev/i2c/ds1307.c index ea4cb0bf4b8..1e380e45a52 100644 --- a/sys/dev/i2c/ds1307.c +++ b/sys/dev/i2c/ds1307.c @@ -1,4 +1,4 @@ -/* $NetBSD: ds1307.c,v 1.16 2012/07/25 03:07:37 matt Exp $ */ +/* $NetBSD: ds1307.c,v 1.17 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.16 2012/07/25 03:07:37 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.17 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -117,8 +117,17 @@ dev_type_read(dsrtc_read); dev_type_write(dsrtc_write); const struct cdevsw dsrtc_cdevsw = { - dsrtc_open, dsrtc_close, dsrtc_read, dsrtc_write, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = dsrtc_open, + .d_close = dsrtc_close, + .d_read = dsrtc_read, + .d_write = dsrtc_write, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static int dsrtc_gettime_ymdhms(struct todr_chip_handle *, struct clock_ymdhms *); diff --git a/sys/dev/i2c/i2c.c b/sys/dev/i2c/i2c.c index 47cfdd37b91..18ef08b537e 100644 --- a/sys/dev/i2c/i2c.c +++ b/sys/dev/i2c/i2c.c @@ -1,4 +1,4 @@ -/* $NetBSD: i2c.c,v 1.42 2013/09/24 18:04:53 jdc Exp $ */ +/* $NetBSD: i2c.c,v 1.43 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.42 2013/09/24 18:04:53 jdc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.43 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,8 +68,17 @@ static dev_type_close(iic_close); static dev_type_ioctl(iic_ioctl); const struct cdevsw iic_cdevsw = { - iic_open, iic_close, noread, nowrite, iic_ioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = iic_open, + .d_close = iic_close, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = iic_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver iic_cd; diff --git a/sys/dev/i2c/m41st84.c b/sys/dev/i2c/m41st84.c index 0420a2e77e5..f7eeef4ad14 100644 --- a/sys/dev/i2c/m41st84.c +++ b/sys/dev/i2c/m41st84.c @@ -1,4 +1,4 @@ -/* $NetBSD: m41st84.c,v 1.19 2013/11/08 03:56:10 nisimura Exp $ */ +/* $NetBSD: m41st84.c,v 1.20 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: m41st84.c,v 1.19 2013/11/08 03:56:10 nisimura Exp $"); +__KERNEL_RCSID(0, "$NetBSD: m41st84.c,v 1.20 2014/03/16 05:20:27 dholland Exp $"); #include "opt_strtc.h" @@ -78,8 +78,17 @@ dev_type_read(strtc_read); dev_type_write(strtc_write); const struct cdevsw strtc_cdevsw = { - strtc_open, strtc_close, strtc_read, strtc_write, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = strtc_open, + .d_close = strtc_close, + .d_read = strtc_read, + .d_write = strtc_write, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; #endif diff --git a/sys/dev/i2c/m41t00.c b/sys/dev/i2c/m41t00.c index 50c02bcf568..163217677e7 100644 --- a/sys/dev/i2c/m41t00.c +++ b/sys/dev/i2c/m41t00.c @@ -1,4 +1,4 @@ -/* $NetBSD: m41t00.c,v 1.16 2009/12/12 14:44:10 tsutsui Exp $ */ +/* $NetBSD: m41t00.c,v 1.17 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: m41t00.c,v 1.16 2009/12/12 14:44:10 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: m41t00.c,v 1.17 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,8 +76,17 @@ dev_type_read(m41t00_read); dev_type_write(m41t00_write); const struct cdevsw m41t00_cdevsw = { - m41t00_open, m41t00_close, m41t00_read, m41t00_write, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = m41t00_open, + .d_close = m41t00_close, + .d_read = m41t00_read, + .d_write = m41t00_write, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static int m41t00_clock_read(struct m41t00_softc *, struct clock_ymdhms *); diff --git a/sys/dev/i2c/max6900.c b/sys/dev/i2c/max6900.c index 4498e00c93e..b8ce8e11d17 100644 --- a/sys/dev/i2c/max6900.c +++ b/sys/dev/i2c/max6900.c @@ -1,4 +1,4 @@ -/* $NetBSD: max6900.c,v 1.12 2009/12/12 14:44:10 tsutsui Exp $ */ +/* $NetBSD: max6900.c,v 1.13 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: max6900.c,v 1.12 2009/12/12 14:44:10 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: max6900.c,v 1.13 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,8 +73,17 @@ dev_type_read(maxrtc_read); dev_type_write(maxrtc_write); const struct cdevsw maxrtc_cdevsw = { - maxrtc_open, maxrtc_close, maxrtc_read, maxrtc_write, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = maxrtc_open, + .d_close = maxrtc_close, + .d_read = maxrtc_read, + .d_write = maxrtc_write, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static int maxrtc_clock_read(struct maxrtc_softc *, struct clock_ymdhms *); diff --git a/sys/dev/i2c/pcf8583.c b/sys/dev/i2c/pcf8583.c index f92ad7f89d2..725dbd6d3f7 100644 --- a/sys/dev/i2c/pcf8583.c +++ b/sys/dev/i2c/pcf8583.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcf8583.c,v 1.13 2011/04/02 08:20:07 mbalmer Exp $ */ +/* $NetBSD: pcf8583.c,v 1.14 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcf8583.c,v 1.13 2011/04/02 08:20:07 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcf8583.c,v 1.14 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,8 +81,17 @@ dev_type_read(pcfrtc_read); dev_type_write(pcfrtc_write); const struct cdevsw pcfrtc_cdevsw = { - pcfrtc_open, pcfrtc_close, pcfrtc_read, pcfrtc_write, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = pcfrtc_open, + .d_close = pcfrtc_close, + .d_read = pcfrtc_read, + .d_write = pcfrtc_write, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static int pcfrtc_clock_read(struct pcfrtc_softc *, struct clock_ymdhms *, diff --git a/sys/dev/i2c/x1226.c b/sys/dev/i2c/x1226.c index a36feb4b102..a2205995f32 100644 --- a/sys/dev/i2c/x1226.c +++ b/sys/dev/i2c/x1226.c @@ -1,4 +1,4 @@ -/* $NetBSD: x1226.c,v 1.14 2009/12/12 14:44:10 tsutsui Exp $ */ +/* $NetBSD: x1226.c,v 1.15 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2003 Shigeyuki Fukushima. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.14 2009/12/12 14:44:10 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.15 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,8 +73,17 @@ dev_type_read(xrtc_read); dev_type_write(xrtc_write); const struct cdevsw xrtc_cdevsw = { - xrtc_open, xrtc_close, xrtc_read, xrtc_write, - noioctl, nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = xrtc_open, + .d_close = xrtc_close, + .d_read = xrtc_read, + .d_write = xrtc_write, + .d_ioctl = + .d_stop = noioctl, + .d_tty = nostop, + .d_poll = notty, + .d_mmap = nopoll, + .d_kqfilter = nommap, + .d_flag = nokqfilter, D_OTHER }; static int xrtc_clock_read(struct xrtc_softc *, struct clock_ymdhms *); diff --git a/sys/dev/i2o/dpti.c b/sys/dev/i2o/dpti.c index 5c4937f73f4..f065b0c3811 100644 --- a/sys/dev/i2o/dpti.c +++ b/sys/dev/i2o/dpti.c @@ -1,4 +1,4 @@ -/* $NetBSD: dpti.c,v 1.45 2012/10/27 17:18:17 chs Exp $ */ +/* $NetBSD: dpti.c,v 1.46 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.45 2012/10/27 17:18:17 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.46 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -137,8 +137,17 @@ dev_type_open(dptiopen); dev_type_ioctl(dptiioctl); const struct cdevsw dpti_cdevsw = { - dptiopen, nullclose, noread, nowrite, dptiioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = dptiopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = dptiioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER, }; extern struct cfdriver dpti_cd; diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c index c73710d258e..9ca024c1641 100644 --- a/sys/dev/i2o/iop.c +++ b/sys/dev/i2o/iop.c @@ -1,4 +1,4 @@ -/* $NetBSD: iop.c,v 1.84 2013/10/17 21:16:12 christos Exp $ */ +/* $NetBSD: iop.c,v 1.85 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.84 2013/10/17 21:16:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.85 2014/03/16 05:20:27 dholland Exp $"); #include "iop.h" @@ -96,8 +96,17 @@ dev_type_close(iopclose); dev_type_ioctl(iopioctl); const struct cdevsw iop_cdevsw = { - iopopen, iopclose, noread, nowrite, iopioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = iopopen, + .d_close = iopclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = iopioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER, }; #define IC_CONFIGURE 0x01 diff --git a/sys/dev/ic/cd18xx.c b/sys/dev/ic/cd18xx.c index 2df01ae060b..c88eb38dce2 100644 --- a/sys/dev/ic/cd18xx.c +++ b/sys/dev/ic/cd18xx.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd18xx.c,v 1.29 2012/10/27 17:18:19 chs Exp $ */ +/* $NetBSD: cd18xx.c,v 1.30 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -92,7 +92,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.29 2012/10/27 17:18:19 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.30 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -138,8 +138,17 @@ dev_type_tty(cdttytty); dev_type_poll(cdttypoll); const struct cdevsw cdtty_cdevsw = { - cdttyopen, cdttyclose, cdttyread, cdttywrite, cdttyioctl, - cdttystop, cdttytty, cdttypoll, nommap, ttykqfilter, D_TTY + .d_open = cdttyopen, + .d_close = cdttyclose, + .d_read = cdttyread, + .d_write = cdttywrite, + .d_ioctl = cdttyioctl, + .d_stop = cdttystop, + .d_tty = cdttytty, + .d_poll = cdttypoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; static void cdtty_shutdown(struct cd18xx_softc *, struct cdtty_port *); diff --git a/sys/dev/ic/clmpcc.c b/sys/dev/ic/clmpcc.c index 1afcf92f80f..7ade0035f21 100644 --- a/sys/dev/ic/clmpcc.c +++ b/sys/dev/ic/clmpcc.c @@ -1,4 +1,4 @@ -/* $NetBSD: clmpcc.c,v 1.46 2012/10/27 17:18:19 chs Exp $ */ +/* $NetBSD: clmpcc.c,v 1.47 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.46 2012/10/27 17:18:19 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.47 2014/03/16 05:20:27 dholland Exp $"); #include "opt_ddb.h" @@ -96,8 +96,17 @@ dev_type_tty(clmpcctty); dev_type_poll(clmpccpoll); const struct cdevsw clmpcc_cdevsw = { - clmpccopen, clmpccclose, clmpccread, clmpccwrite, clmpccioctl, - clmpccstop, clmpcctty, clmpccpoll, nommap, ttykqfilter, D_TTY + .d_open = clmpccopen, + .d_close = clmpccclose, + .d_read = clmpccread, + .d_write = clmpccwrite, + .d_ioctl = clmpccioctl, + .d_stop = clmpccstop, + .d_tty = clmpcctty, + .d_poll = clmpccpoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; /* diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 4cda2a4ed1a..e45027c4bcb 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.322 2013/12/22 18:20:46 matt Exp $ */ +/* $NetBSD: com.c,v 1.323 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.322 2013/12/22 18:20:46 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.323 2014/03/16 05:20:27 dholland Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -215,8 +215,17 @@ static struct consdev comcons = { const struct cdevsw com_cdevsw = { - comopen, comclose, comread, comwrite, comioctl, - comstop, comtty, compoll, nommap, ttykqfilter, D_TTY + .d_open = comopen, + .d_close = comclose, + .d_read = comread, + .d_write = comwrite, + .d_ioctl = comioctl, + .d_stop = comstop, + .d_tty = comtty, + .d_poll = compoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; /* diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c index 2519ff5a6a7..0957959ccb6 100644 --- a/sys/dev/ic/dpt.c +++ b/sys/dev/ic/dpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: dpt.c,v 1.69 2013/09/12 19:49:08 martin Exp $ */ +/* $NetBSD: dpt.c,v 1.70 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.69 2013/09/12 19:49:08 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.70 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -137,8 +137,17 @@ dev_type_open(dptopen); dev_type_ioctl(dptioctl); const struct cdevsw dpt_cdevsw = { - dptopen, nullclose, noread, nowrite, dptioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = dptopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = dptioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER, }; extern struct cfdriver dpt_cd; diff --git a/sys/dev/ic/icp_ioctl.c b/sys/dev/ic/icp_ioctl.c index 36289f86174..602262c8970 100644 --- a/sys/dev/ic/icp_ioctl.c +++ b/sys/dev/ic/icp_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: icp_ioctl.c,v 1.19 2008/06/08 12:43:51 tsutsui Exp $ */ +/* $NetBSD: icp_ioctl.c,v 1.20 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.19 2008/06/08 12:43:51 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.20 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,8 +93,17 @@ static dev_type_open(icpopen); static dev_type_ioctl(icpioctl); const struct cdevsw icp_cdevsw = { - icpopen, nullclose, noread, nowrite, icpioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = icpopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = icpioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver icp_cd; diff --git a/sys/dev/ic/joy.c b/sys/dev/ic/joy.c index 7b90719e58d..00dc1368f75 100644 --- a/sys/dev/ic/joy.c +++ b/sys/dev/ic/joy.c @@ -1,4 +1,4 @@ -/* $NetBSD: joy.c,v 1.18 2011/11/23 23:07:32 jmcneill Exp $ */ +/* $NetBSD: joy.c,v 1.19 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.18 2011/11/23 23:07:32 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.19 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -102,8 +102,17 @@ static dev_type_read(joyread); static dev_type_ioctl(joyioctl); const struct cdevsw joy_cdevsw = { - joyopen, joyclose, joyread, nowrite, joyioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER | D_MPSAFE, + .d_open = joyopen, + .d_close = joyclose, + .d_read = joyread, + .d_write = nowrite, + .d_ioctl = joyioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER | D_MPSAFE }; void diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c index 2bf2645ee7d..cc6823ae3b6 100644 --- a/sys/dev/ic/lpt.c +++ b/sys/dev/ic/lpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt.c,v 1.78 2009/11/25 14:28:50 rmind Exp $ */ +/* $NetBSD: lpt.c,v 1.79 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.78 2009/11/25 14:28:50 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.79 2014/03/16 05:20:27 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,8 +96,17 @@ dev_type_write(lptwrite); dev_type_ioctl(lptioctl); const struct cdevsw lpt_cdevsw = { - lptopen, lptclose, noread, lptwrite, lptioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = lptopen, + .d_close = lptclose, + .d_read = noread, + .d_write = lptwrite, + .d_ioctl = lptioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; #define LPTUNIT(s) (minor(s) & 0x1f) diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 83136e9568a..658486c751d 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $NetBSD: mfi.c,v 1.51 2014/01/25 10:14:29 skrll Exp $ */ +/* $NetBSD: mfi.c,v 1.52 2014/03/16 05:20:27 dholland Exp $ */ /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */ /* @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.51 2014/01/25 10:14:29 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.52 2014/03/16 05:20:27 dholland Exp $"); #include "bio.h" @@ -184,8 +184,17 @@ static dev_type_open(mfifopen); static dev_type_close(mfifclose); static dev_type_ioctl(mfifioctl); const struct cdevsw mfi_cdevsw = { - mfifopen, mfifclose, noread, nowrite, mfifioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = mfifopen, + .d_close = mfifclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = mfifioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver mfi_cd; diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c index 5a519d71d82..18e60cf6be2 100644 --- a/sys/dev/ic/mlx.c +++ b/sys/dev/ic/mlx.c @@ -1,4 +1,4 @@ -/* $NetBSD: mlx.c,v 1.60 2012/10/27 17:18:21 chs Exp $ */ +/* $NetBSD: mlx.c,v 1.61 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.60 2012/10/27 17:18:21 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.61 2014/03/16 05:20:27 dholland Exp $"); #include "ld.h" @@ -131,8 +131,17 @@ dev_type_close(mlxclose); dev_type_ioctl(mlxioctl); const struct cdevsw mlx_cdevsw = { - mlxopen, mlxclose, noread, nowrite, mlxioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = mlxopen, + .d_close = mlxclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = mlxioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver mlx_cd; diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c index 0731dc13fb9..6374e825f9a 100644 --- a/sys/dev/ic/rrunner.c +++ b/sys/dev/ic/rrunner.c @@ -1,4 +1,4 @@ -/* $NetBSD: rrunner.c,v 1.76 2013/09/15 13:43:20 martin Exp $ */ +/* $NetBSD: rrunner.c,v 1.77 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.76 2013/09/15 13:43:20 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.77 2014/03/16 05:20:27 dholland Exp $"); #include "opt_inet.h" @@ -120,15 +120,21 @@ dev_type_mmap(esh_fpmmap); dev_type_strategy(esh_fpstrategy); const struct cdevsw esh_cdevsw = { - esh_fpopen, esh_fpclose, esh_fpread, esh_fpwrite, nullioctl, - nostop, notty, nullpoll, + .d_open = esh_fpopen, + .d_close = esh_fpclose, + .d_read = esh_fpread, + .d_write = esh_fpwrite, + .d_ioctl = nullioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nullpoll, #ifdef MORE_DONE - esh_fpmmap, + .d_mmap = esh_fpmmap, #else - nommap, + .d_mmap = nommap, #endif - nullkqfilter, - D_OTHER, + .d_kqfilter = nullkqfilter, + .d_flag = D_OTHER }; /* General routines, not externally visable */ diff --git a/sys/dev/ic/tpm.c b/sys/dev/ic/tpm.c index d8fea740e27..853d3e9e38f 100644 --- a/sys/dev/ic/tpm.c +++ b/sys/dev/ic/tpm.c @@ -1,4 +1,4 @@ -/* $NetBSD: tpm.c,v 1.9 2013/10/17 21:24:24 christos Exp $ */ +/* $NetBSD: tpm.c,v 1.10 2014/03/16 05:20:27 dholland Exp $ */ /* * Copyright (c) 2008, 2009 Michael Shalayeff * Copyright (c) 2009, 2010 Hans-Jörg Höxer @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.9 2013/10/17 21:24:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.10 2014/03/16 05:20:27 dholland Exp $"); #if 0 #define TPM_DEBUG @@ -78,8 +78,17 @@ extern struct cfdriver tpm_cd; #define TPMUNIT(a) minor(a) const struct cdevsw tpm_cdevsw = { - tpmopen, tpmclose, tpmread, tpmwrite, tpmioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = tpmopen, + .d_close = tpmclose, + .d_read = tpmread, + .d_write = tpmwrite, + .d_ioctl = tpmioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER, }; /* Probe TPM using TIS 1.2 interface. */ diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c index a4c3ef46bdb..8d924421ab4 100644 --- a/sys/dev/ic/z8530tty.c +++ b/sys/dev/ic/z8530tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: z8530tty.c,v 1.128 2011/04/24 16:27:00 rmind Exp $ */ +/* $NetBSD: z8530tty.c,v 1.129 2014/03/16 05:20:27 dholland Exp $ */ /*- * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999 @@ -137,7 +137,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.128 2011/04/24 16:27:00 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.129 2014/03/16 05:20:27 dholland Exp $"); #include "opt_kgdb.h" #include "opt_ntp.h" @@ -252,8 +252,17 @@ dev_type_tty(zstty); dev_type_poll(zspoll); const struct cdevsw zstty_cdevsw = { - zsopen, zsclose, zsread, zswrite, zsioctl, - zsstop, zstty, zspoll, nommap, ttykqfilter, D_TTY + .d_open = zsopen, + .d_close = zsclose, + .d_read = zsread, + .d_write = zswrite, + .d_ioctl = zsioctl, + .d_stop = zsstop, + .d_tty = zstty, + .d_poll = zspoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; struct zsops zsops_tty; diff --git a/sys/dev/ieee1394/fwdev.c b/sys/dev/ieee1394/fwdev.c index 296ce5bb476..9129b09af5f 100644 --- a/sys/dev/ieee1394/fwdev.c +++ b/sys/dev/ieee1394/fwdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwdev.c,v 1.27 2012/04/29 18:31:40 dsl Exp $ */ +/* $NetBSD: fwdev.c,v 1.28 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.27 2012/04/29 18:31:40 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.28 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -72,12 +72,27 @@ dev_type_mmap(fw_mmap); dev_type_strategy(fw_strategy); const struct bdevsw fw_bdevsw = { - fw_open, fw_close, fw_strategy, fw_ioctl, nodump, nosize, D_OTHER, + .d_open = fw_open, + .d_close = fw_close, + .d_strategy = fw_strategy, + .d_ioctl = fw_ioctl, + .d_dump = nodump, + .d_psize = nosize, + .d_flag = D_OTHER }; const struct cdevsw fw_cdevsw = { - fw_open, fw_close, fw_read, fw_write, fw_ioctl, - nostop, notty, fw_poll, fw_mmap, nokqfilter, D_OTHER, + .d_open = fw_open, + .d_close = fw_close, + .d_read = fw_read, + .d_write = fw_write, + .d_ioctl = fw_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = fw_poll, + .d_mmap = fw_mmap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; struct fw_drv1 { diff --git a/sys/dev/ir/cir.c b/sys/dev/ir/cir.c index b1d0c24d730..9b41f123c62 100644 --- a/sys/dev/ir/cir.c +++ b/sys/dev/ir/cir.c @@ -1,4 +1,4 @@ -/* $NetBSD: cir.c,v 1.29 2011/07/26 08:59:38 mrg Exp $ */ +/* $NetBSD: cir.c,v 1.30 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.29 2011/07/26 08:59:38 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.30 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -55,9 +55,17 @@ dev_type_ioctl(cirioctl); dev_type_poll(cirpoll); const struct cdevsw cir_cdevsw = { - ciropen, circlose, cirread, cirwrite, cirioctl, - nostop, notty, cirpoll, nommap, nokqfilter, - D_OTHER + .d_open = ciropen, + .d_close = circlose, + .d_read = cirread, + .d_write = cirwrite, + .d_ioctl = cirioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = cirpoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; int cir_match(device_t parent, cfdata_t match, void *aux); diff --git a/sys/dev/ir/irframe.c b/sys/dev/ir/irframe.c index 050d3d3d163..c4080c2cb16 100644 --- a/sys/dev/ir/irframe.c +++ b/sys/dev/ir/irframe.c @@ -1,4 +1,4 @@ -/* $NetBSD: irframe.c,v 1.44 2009/12/06 22:40:56 dyoung Exp $ */ +/* $NetBSD: irframe.c,v 1.45 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irframe.c,v 1.44 2009/12/06 22:40:56 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irframe.c,v 1.45 2014/03/16 05:20:28 dholland Exp $"); #include "irframe.h" @@ -67,8 +67,17 @@ dev_type_poll(irframepoll); dev_type_kqfilter(irframekqfilter); const struct cdevsw irframe_cdevsw = { - irframeopen, irframeclose, irframeread, irframewrite, irframeioctl, - nostop, notty, irframepoll, nommap, irframekqfilter, D_OTHER, + .d_open = irframeopen, + .d_close = irframeclose, + .d_read = irframeread, + .d_write = irframewrite, + .d_ioctl = irframeioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = irframepoll, + .d_mmap = nommap, + .d_kqfilter = irframekqfilter, + .d_flag = D_OTHER }; int irframe_match(device_t parent, cfdata_t match, void *aux); diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index eb2ad9e0604..33de9064e3d 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.101 2013/05/29 00:47:48 christos Exp $ */ +/* $NetBSD: fd.c,v 1.102 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.101 2013/05/29 00:47:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.102 2014/03/16 05:20:28 dholland Exp $"); #include "opt_ddb.h" @@ -224,12 +224,27 @@ dev_type_ioctl(fdioctl); dev_type_strategy(fdstrategy); const struct bdevsw fd_bdevsw = { - fdopen, fdclose, fdstrategy, fdioctl, nodump, nosize, D_DISK + .d_open = fdopen, + .d_close = fdclose, + .d_strategy = fdstrategy, + .d_ioctl = fdioctl, + .d_dump = nodump, + .d_psize = nosize, + .d_flag = D_DISK }; const struct cdevsw fd_cdevsw = { - fdopen, fdclose, fdread, fdwrite, fdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = fdopen, + .d_close = fdclose, + .d_read = fdread, + .d_write = fdwrite, + .d_ioctl = fdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; void fdgetdisklabel(struct fd_softc *); diff --git a/sys/dev/isa/isv.c b/sys/dev/isa/isv.c index dc5e0370e0b..15960574583 100644 --- a/sys/dev/isa/isv.c +++ b/sys/dev/isa/isv.c @@ -1,4 +1,4 @@ -/* $NetBSD: isv.c,v 1.4 2010/11/06 10:59:45 uebayasi Exp $ */ +/* $NetBSD: isv.c,v 1.5 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isv.c,v 1.4 2010/11/06 10:59:45 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isv.c,v 1.5 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,8 +105,17 @@ CFATTACH_DECL_NEW(isv_isa, sizeof(struct isv_softc), isv_match, isv_attach, isv_detach, NULL); const struct cdevsw isv_cdevsw = { - isv_open, nullclose, noread, nowrite, isv_ioctl, - nostop, notty, nopoll, isv_mmap, nokqfilter, D_OTHER + .d_open = isv_open, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = isv_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = isv_mmap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static uint16_t diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c index ada6cae184a..89ac71915b8 100644 --- a/sys/dev/isa/mcd.c +++ b/sys/dev/isa/mcd.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcd.c,v 1.110 2012/10/27 17:18:25 chs Exp $ */ +/* $NetBSD: mcd.c,v 1.111 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved. @@ -56,7 +56,7 @@ /*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.110 2012/10/27 17:18:25 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.111 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -208,12 +208,27 @@ dev_type_dump(mcddump); dev_type_size(mcdsize); const struct bdevsw mcd_bdevsw = { - mcdopen, mcdclose, mcdstrategy, mcdioctl, mcddump, mcdsize, D_DISK + .d_open = mcdopen, + .d_close = mcdclose, + .d_strategy = mcdstrategy, + .d_ioctl = mcdioctl, + .d_dump = mcddump, + .d_psize = mcdsize, + .d_flag = D_DISK }; const struct cdevsw mcd_cdevsw = { - mcdopen, mcdclose, mcdread, mcdwrite, mcdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = mcdopen, + .d_close = mcdclose, + .d_read = mcdread, + .d_write = mcdwrite, + .d_ioctl = mcdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; void mcdgetdefaultlabel(struct mcd_softc *, struct disklabel *); diff --git a/sys/dev/isa/satlink.c b/sys/dev/isa/satlink.c index 405a954c13a..545b62d2705 100644 --- a/sys/dev/isa/satlink.c +++ b/sys/dev/isa/satlink.c @@ -1,4 +1,4 @@ -/* $NetBSD: satlink.c,v 1.43 2012/10/27 17:18:25 chs Exp $ */ +/* $NetBSD: satlink.c,v 1.44 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.43 2012/10/27 17:18:25 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.44 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -109,8 +109,17 @@ dev_type_poll(satlinkpoll); dev_type_kqfilter(satlinkkqfilter); const struct cdevsw satlink_cdevsw = { - satlinkopen, satlinkclose, satlinkread, nowrite, satlinkioctl, - nostop, notty, satlinkpoll, nommap, satlinkkqfilter, D_OTHER, + .d_open = satlinkopen, + .d_close = satlinkclose, + .d_read = satlinkread, + .d_write = nowrite, + .d_ioctl = satlinkioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = satlinkpoll, + .d_mmap = nommap, + .d_kqfilter = satlinkkqfilter, + .d_flag = D_OTHER }; int diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c index 0cdd76b1a5a..c41e041a428 100644 --- a/sys/dev/isa/spkr.c +++ b/sys/dev/isa/spkr.c @@ -1,4 +1,4 @@ -/* $NetBSD: spkr.c,v 1.33 2012/04/06 20:16:58 plunky Exp $ */ +/* $NetBSD: spkr.c,v 1.34 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com) @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.33 2012/04/06 20:16:58 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.34 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,8 +74,17 @@ dev_type_write(spkrwrite); dev_type_ioctl(spkrioctl); const struct cdevsw spkr_cdevsw = { - spkropen, spkrclose, noread, spkrwrite, spkrioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = spkropen, + .d_close = spkrclose, + .d_read = noread, + .d_write = spkrwrite, + .d_ioctl = spkrioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static pcppi_tag_t ppicookie; diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c index 9b9f177a804..240d7022743 100644 --- a/sys/dev/isa/wt.c +++ b/sys/dev/isa/wt.c @@ -1,4 +1,4 @@ -/* $NetBSD: wt.c,v 1.83 2012/10/27 17:18:25 chs Exp $ */ +/* $NetBSD: wt.c,v 1.84 2014/03/16 05:20:28 dholland Exp $ */ /* * Streamer tape driver. @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.83 2012/10/27 17:18:25 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.84 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -158,12 +158,27 @@ static dev_type_dump(wtdump); static dev_type_size(wtsize); const struct bdevsw wt_bdevsw = { - wtopen, wtclose, wtstrategy, wtioctl, wtdump, wtsize, D_TAPE + .d_open = wtopen, + .d_close = wtclose, + .d_strategy = wtstrategy, + .d_ioctl = wtioctl, + .d_dump = wtdump, + .d_psize = wtsize, + .d_flag = D_TAPE }; const struct cdevsw wt_cdevsw = { - wtopen, wtclose, wtread, wtwrite, wtioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_TAPE + .d_open = wtopen, + .d_close = wtclose, + .d_read = wtread, + .d_write = wtwrite, + .d_ioctl = wtioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_TAPE }; static int wtwait(struct wt_softc *sc, int catch, const char *msg); diff --git a/sys/dev/iscsi/iscsi_main.c b/sys/dev/iscsi/iscsi_main.c index 226d8d0f189..20306e51247 100644 --- a/sys/dev/iscsi/iscsi_main.c +++ b/sys/dev/iscsi/iscsi_main.c @@ -90,9 +90,17 @@ static dev_type_open(iscsiopen); static dev_type_close(iscsiclose); struct cdevsw iscsi_cdevsw = { - iscsiopen, iscsiclose, - noread, nowrite, - iscsiioctl, nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = iscsiopen, + .d_close = iscsiclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = iscsiioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /******************************************************************************/ diff --git a/sys/dev/kttcp.c b/sys/dev/kttcp.c index 984e847af54..4baad4f03f0 100644 --- a/sys/dev/kttcp.c +++ b/sys/dev/kttcp.c @@ -1,4 +1,4 @@ -/* $NetBSD: kttcp.c,v 1.31 2013/08/29 17:49:21 rmind Exp $ */ +/* $NetBSD: kttcp.c,v 1.32 2014/03/16 05:20:26 dholland Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.31 2013/08/29 17:49:21 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.32 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -75,8 +75,17 @@ void kttcpattach(int); dev_type_ioctl(kttcpioctl); const struct cdevsw kttcp_cdevsw = { - nullopen, nullclose, noread, nowrite, kttcpioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = nullopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = kttcpioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; void diff --git a/sys/dev/ld.c b/sys/dev/ld.c index 95d2a904233..bb77b62a278 100644 --- a/sys/dev/ld.c +++ b/sys/dev/ld.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld.c,v 1.71 2013/05/29 00:47:48 christos Exp $ */ +/* $NetBSD: ld.c,v 1.72 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.71 2013/05/29 00:47:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.72 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,12 +82,27 @@ static dev_type_dump(lddump); static dev_type_size(ldsize); const struct bdevsw ld_bdevsw = { - ldopen, ldclose, ldstrategy, ldioctl, lddump, ldsize, D_DISK + .d_open = ldopen, + .d_close = ldclose, + .d_strategy = ldstrategy, + .d_ioctl = ldioctl, + .d_dump = lddump, + .d_psize = ldsize, + .d_flag = D_DISK }; const struct cdevsw ld_cdevsw = { - ldopen, ldclose, ldread, ldwrite, ldioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = ldopen, + .d_close = ldclose, + .d_read = ldread, + .d_write = ldwrite, + .d_ioctl = ldioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver lddkdriver = { ldstrategy, ldminphys }; diff --git a/sys/dev/lockstat.c b/sys/dev/lockstat.c index d6ae306bf6b..bd5a5674187 100644 --- a/sys/dev/lockstat.c +++ b/sys/dev/lockstat.c @@ -1,4 +1,4 @@ -/* $NetBSD: lockstat.c,v 1.16 2012/12/10 06:07:34 msaitoh Exp $ */ +/* $NetBSD: lockstat.c,v 1.17 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.16 2012/12/10 06:07:34 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.17 2014/03/16 05:20:26 dholland Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -111,8 +111,17 @@ int lockstat_busy; struct timespec lockstat_stime; const struct cdevsw lockstat_cdevsw = { - lockstat_open, lockstat_close, lockstat_read, nowrite, lockstat_ioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER | D_MPSAFE + .d_open = lockstat_open, + .d_close = lockstat_close, + .d_read = lockstat_read, + .d_write = nowrite, + .d_ioctl = lockstat_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER | D_MPSAFE }; /* diff --git a/sys/dev/marvell/gtmpsc.c b/sys/dev/marvell/gtmpsc.c index b68b540e33c..b11c0573a8e 100644 --- a/sys/dev/marvell/gtmpsc.c +++ b/sys/dev/marvell/gtmpsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: gtmpsc.c,v 1.43 2011/04/24 16:27:00 rmind Exp $ */ +/* $NetBSD: gtmpsc.c,v 1.44 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi * All rights reserved. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.43 2011/04/24 16:27:00 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.44 2014/03/16 05:20:28 dholland Exp $"); #include "opt_kgdb.h" @@ -158,8 +158,17 @@ dev_type_tty(gtmpsctty); dev_type_poll(gtmpscpoll); const struct cdevsw gtmpsc_cdevsw = { - gtmpscopen, gtmpscclose, gtmpscread, gtmpscwrite, gtmpscioctl, - gtmpscstop, gtmpsctty, gtmpscpoll, nommap, ttykqfilter, D_TTY + .d_open = gtmpscopen, + .d_close = gtmpscclose, + .d_read = gtmpscread, + .d_write = gtmpscwrite, + .d_ioctl = gtmpscioctl, + .d_stop = gtmpscstop, + .d_tty = gtmpsctty, + .d_poll = gtmpscpoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; CFATTACH_DECL_NEW(gtmpsc, sizeof(struct gtmpsc_softc), diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c index 651326f776f..84b56c19296 100644 --- a/sys/dev/mca/ed_mca.c +++ b/sys/dev/mca/ed_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: ed_mca.c,v 1.53 2012/10/27 17:18:26 chs Exp $ */ +/* $NetBSD: ed_mca.c,v 1.54 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.53 2012/10/27 17:18:26 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.54 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,13 +96,27 @@ dev_type_dump(edmcadump); dev_type_size(edmcasize); const struct bdevsw ed_bdevsw = { - edmcaopen, edmcaclose, edmcastrategy, edmcaioctl, - edmcadump, edmcasize, D_DISK + .d_open = edmcaopen, + .d_close = edmcaclose, + .d_strategy = edmcastrategy, + .d_ioctl = edmcaioctl, + .d_dump = edmcadump, + .d_psize = edmcasize, + .d_flag = D_DISK }; const struct cdevsw ed_cdevsw = { - edmcaopen, edmcaclose, edmcaread, edmcawrite, edmcaioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = edmcaopen, + .d_close = edmcaclose, + .d_read = edmcaread, + .d_write = edmcawrite, + .d_ioctl = edmcaioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver eddkdriver = { edmcastrategy, minphys }; diff --git a/sys/dev/md.c b/sys/dev/md.c index 3f9fd5b5ba3..925b0537d7b 100644 --- a/sys/dev/md.c +++ b/sys/dev/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.68 2014/03/13 10:22:35 hannken Exp $ */ +/* $NetBSD: md.c,v 1.69 2014/03/16 05:20:26 dholland Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross, Leo Weppelman. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.68 2014/03/13 10:22:35 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.69 2014/03/16 05:20:26 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_md.h" @@ -107,12 +107,27 @@ static dev_type_strategy(mdstrategy); static dev_type_size(mdsize); const struct bdevsw md_bdevsw = { - mdopen, mdclose, mdstrategy, mdioctl, nodump, mdsize, D_DISK | D_MPSAFE + .d_open = mdopen, + .d_close = mdclose, + .d_strategy = mdstrategy, + .d_ioctl = mdioctl, + .d_dump = nodump, + .d_psize = mdsize, + .d_flag = D_DISK | D_MPSAFE }; const struct cdevsw md_cdevsw = { - mdopen, mdclose, mdread, mdwrite, mdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = mdopen, + .d_close = mdclose, + .d_read = mdread, + .d_write = mdwrite, + .d_ioctl = mdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver mddkdriver = { mdstrategy, NULL }; diff --git a/sys/dev/midi.c b/sys/dev/midi.c index 0716e7abdad..92ed8cf922d 100644 --- a/sys/dev/midi.c +++ b/sys/dev/midi.c @@ -1,4 +1,4 @@ -/* $NetBSD: midi.c,v 1.79 2013/09/14 21:02:36 martin Exp $ */ +/* $NetBSD: midi.c,v 1.80 2014/03/16 05:20:26 dholland Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.79 2013/09/14 21:02:36 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.80 2014/03/16 05:20:26 dholland Exp $"); #include "midi.h" #include "sequencer.h" @@ -109,8 +109,17 @@ static dev_type_poll(midipoll); static dev_type_kqfilter(midikqfilter); const struct cdevsw midi_cdevsw = { - midiopen, midiclose, midiread, midiwrite, midiioctl, - nostop, notty, midipoll, nommap, midikqfilter, D_OTHER | D_MPSAFE + .d_open = midiopen, + .d_close = midiclose, + .d_read = midiread, + .d_write = midiwrite, + .d_ioctl = midiioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = midipoll, + .d_mmap = nommap, + .d_kqfilter = midikqfilter, + .d_flag = D_OTHER | D_MPSAFE }; CFATTACH_DECL_NEW(midi, sizeof(struct midi_softc), diff --git a/sys/dev/mm.c b/sys/dev/mm.c index 4c6f8168e4b..b4d6aa70df5 100644 --- a/sys/dev/mm.c +++ b/sys/dev/mm.c @@ -1,4 +1,4 @@ -/* $NetBSD: mm.c,v 1.17 2013/01/19 00:27:34 matt Exp $ */ +/* $NetBSD: mm.c,v 1.18 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2002, 2008, 2010 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.17 2013/01/19 00:27:34 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.18 2014/03/16 05:20:26 dholland Exp $"); #include "opt_compat_netbsd.h" @@ -60,19 +60,35 @@ static dev_type_ioctl(mm_ioctl); const struct cdevsw mem_cdevsw = { #ifdef __HAVE_MM_MD_OPEN - mm_md_open, + .d_open = mm_md_open, #else - nullopen, + .d_open = nullopen, #endif - nullclose, mm_readwrite, mm_readwrite, - mm_ioctl, nostop, notty, nopoll, mm_mmap, nokqfilter, - D_MPSAFE + .d_close = nullclose, + .d_read = mm_readwrite, + .d_write = mm_readwrite, + .d_ioctl = mm_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = mm_mmap, + .d_kqfilter = nokqfilter, + .d_flag = D_MPSAFE }; #ifdef pmax /* XXX */ const struct cdevsw mem_ultrix_cdevsw = { - nullopen, nullclose, mm_readwrite, mm_readwrite, mm_ioctl, - nostop, notty, nopoll, mm_mmap, nokqfilter, D_MPSAFE + .d_open = nullopen, + .d_close = nullclose, + .d_read = mm_readwrite, + .d_write = mm_readwrite, + .d_ioctl = mm_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = mm_mmap, + .d_kqfilter = nokqfilter, + .d_flag = D_MPSAFE }; #endif diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c index 9b6d9e52111..8bb37792379 100644 --- a/sys/dev/mscp/mscp_disk.c +++ b/sys/dev/mscp/mscp_disk.c @@ -1,4 +1,4 @@ -/* $NetBSD: mscp_disk.c,v 1.77 2013/10/25 16:00:35 martin Exp $ */ +/* $NetBSD: mscp_disk.c,v 1.78 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.77 2013/10/25 16:00:35 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.78 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -157,12 +157,27 @@ dev_type_size(rasize); #if NRA const struct bdevsw ra_bdevsw = { - raopen, raclose, rastrategy, raioctl, radump, rasize, D_DISK + .d_open = raopen, + .d_close = raclose, + .d_strateegy = rastrategy, + .d_ioctl = raioctl, + .d_dump = radump, + .d_psize = rasize, + .d_flag = D_DISK }; const struct cdevsw ra_cdevsw = { - raopen, raclose, raread, rawrite, raioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = raopen, + .d_close = raclose, + .d_read = raread, + .d_write = rawrite, + .d_ioctl = raioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver radkdriver = { @@ -563,12 +578,27 @@ dev_type_dump(radump); dev_type_size(rxsize); const struct bdevsw rx_bdevsw = { - rxopen, nullclose, rxstrategy, rxioctl, radump, rxsize, D_DISK + .d_open = rxopen, + .d_close = nullclose, + .d_strategy = rxstrategy, + .d_ioctl = rxioctl, + .d_dump = radump, + .d_psize = rxsize, + .d_flag = D_DISK }; const struct cdevsw rx_cdevsw = { - rxopen, nullclose, rxread, rxwrite, rxioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = rxopen, + .d_close = nullclose, + .d_read = rxread, + .d_write = rxwrite, + .d_ioctl = rxioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver rxdkdriver = { @@ -619,12 +649,27 @@ dev_type_dump(radump); dev_type_size(rasize); const struct bdevsw racd_bdevsw = { - raopen, nullclose, rastrategy, raioctl, radump, rasize, D_DISK + .d_open = raopen, + .d_close = nullclose, + .d_strategy = rastrategy, + .d_ioctl = raioctl, + .d_dump = radump, + .d_psize = rasize, + .d_flag = D_DISK }; const struct cdevsw racd_cdevsw = { - raopen, nullclose, raread, rawrite, raioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = raopen, + .d_close = nullclose, + .d_read = raread, + .d_write = rawrite, + .d_ioctl = raioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver racddkdriver = { diff --git a/sys/dev/mscp/mscp_tape.c b/sys/dev/mscp/mscp_tape.c index ce65b2b043a..000fdad4282 100644 --- a/sys/dev/mscp/mscp_tape.c +++ b/sys/dev/mscp/mscp_tape.c @@ -1,4 +1,4 @@ -/* $NetBSD: mscp_tape.c,v 1.40 2013/10/25 16:00:35 martin Exp $ */ +/* $NetBSD: mscp_tape.c,v 1.41 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.40 2013/10/25 16:00:35 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.41 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -124,12 +124,27 @@ dev_type_strategy(mtstrategy); dev_type_dump(mtdump); const struct bdevsw mt_bdevsw = { - mtopen, mtclose, mtstrategy, mtioctl, mtdump, nosize, D_TAPE + .d_open = mtopen, + .d_close = mtclose, + .d_strategy = mtstrategy, + .d_ioctl = mtioctl, + .d_dump = mtdump, + .d_psize = nosize, + .d_flag = D_TAPE }; const struct cdevsw mt_cdevsw = { - mtopen, mtclose, mtread, mtwrite, mtioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_TAPE + .d_open = mtopen, + .d_close = mtclose, + .d_read = mtread, + .d_write = mtwrite, + .d_ioctl = mtioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_TAPE }; /* diff --git a/sys/dev/mvme/lpt_mvme.c b/sys/dev/mvme/lpt_mvme.c index 8d48ebb6670..66c400aacbb 100644 --- a/sys/dev/mvme/lpt_mvme.c +++ b/sys/dev/mvme/lpt_mvme.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_mvme.c,v 1.16 2009/11/23 02:13:47 rmind Exp $ */ +/* $NetBSD: lpt_mvme.c,v 1.17 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -84,7 +84,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.16 2009/11/23 02:13:47 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.17 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -130,8 +130,17 @@ dev_type_write(lptwrite); dev_type_ioctl(lptioctl); const struct cdevsw lpt_cdevsw = { - lptopen, lptclose, noread, lptwrite, lptioctl, - nostop, notty, nopoll, nommap, nokqfilter, + .d_open = lptopen, + .d_close = lptclose, + .d_read = noread, + .d_write = lptwrite, + .d_ioctl = lptioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = 0 }; void diff --git a/sys/dev/nullcons_subr.c b/sys/dev/nullcons_subr.c index 165c195f424..07d61e62dd8 100644 --- a/sys/dev/nullcons_subr.c +++ b/sys/dev/nullcons_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: nullcons_subr.c,v 1.11 2011/04/24 16:26:59 rmind Exp $ */ +/* $NetBSD: nullcons_subr.c,v 1.12 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.11 2011/04/24 16:26:59 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.12 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -52,8 +52,17 @@ dev_type_tty(nullcndev_tty); static int nullcons_newdev(struct consdev *); const struct cdevsw nullcn_devsw = { - nullopen, nullclose, nullcndev_read, nullwrite, nullcndev_ioctl, - nullstop, nullcndev_tty, nopoll, nommap, ttykqfilter, D_TTY + .d_open = nullopen, + .d_close = nullclose, + .d_read = nullcndev_read, + .d_write = nullwrite, + .d_ioctl = nullcndev_ioctl, + .d_stop = nullstop, + .d_tty = nullcndev_tty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; /* diff --git a/sys/dev/ofw/ofcons.c b/sys/dev/ofw/ofcons.c index 662f1316bc0..93937cdc2ec 100644 --- a/sys/dev/ofw/ofcons.c +++ b/sys/dev/ofw/ofcons.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofcons.c,v 1.43 2011/07/26 08:59:38 mrg Exp $ */ +/* $NetBSD: ofcons.c,v 1.44 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.43 2011/07/26 08:59:38 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.44 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -78,8 +78,17 @@ dev_type_tty(ofcons_tty); dev_type_poll(ofcons_poll); const struct cdevsw ofcons_cdevsw = { - ofcons_open, ofcons_close, ofcons_read, ofcons_write, ofcons_ioctl, - nostop, ofcons_tty, ofcons_poll, nommap, ttykqfilter, D_TTY + .d_open = ofcons_open, + .d_close = ofcons_close, + .d_read = ofcons_read, + .d_write = ofcons_write, + .d_ioctl = ofcons_ioctl, + .d_stop = nostop, + .d_tty = ofcons_tty, + .d_poll = ofcons_poll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; static int ofcons_probe(void); diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c index 58e4c88d764..6c0a8ecb8d5 100644 --- a/sys/dev/ofw/ofdisk.c +++ b/sys/dev/ofw/ofdisk.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofdisk.c,v 1.44 2011/07/26 08:59:38 mrg Exp $ */ +/* $NetBSD: ofdisk.c,v 1.45 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.44 2011/07/26 08:59:38 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.45 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -81,13 +81,27 @@ dev_type_dump(ofdisk_dump); dev_type_size(ofdisk_size); const struct bdevsw ofdisk_bdevsw = { - ofdisk_open, ofdisk_close, ofdisk_strategy, ofdisk_ioctl, - ofdisk_dump, ofdisk_size, D_DISK + .d_open = ofdisk_open, + .d_close = ofdisk_close, + .d_strategy = ofdisk_strategy, + .d_ioctl = ofdisk_ioctl, + .d_dump = ofdisk_dump, + .d_psize = ofdisk_size, + .d_flag = D_DISK }; const struct cdevsw ofdisk_cdevsw = { - ofdisk_open, ofdisk_close, ofdisk_read, ofdisk_write, ofdisk_ioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = ofdisk_open, + .d_close = ofdisk_close, + .d_read = ofdisk_read, + .d_write = ofdisk_write, + .d_ioctl = ofdisk_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static void ofminphys(struct buf *); diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c index e708db01248..7b59f63c69f 100644 --- a/sys/dev/ofw/openfirmio.c +++ b/sys/dev/ofw/openfirmio.c @@ -1,4 +1,4 @@ -/* $NetBSD: openfirmio.c,v 1.11 2007/03/04 06:02:15 christos Exp $ */ +/* $NetBSD: openfirmio.c,v 1.12 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: openfirmio.c,v 1.11 2007/03/04 06:02:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: openfirmio.c,v 1.12 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,8 +66,17 @@ void openfirmattach (int); dev_type_ioctl(openfirmioctl); const struct cdevsw openfirm_cdevsw = { - nullopen, nullclose, noread, nowrite, openfirmioctl, - nostop, notty, nopoll, nommap, nokqfilter, + .d_open = nullopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = openfirmioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = 0 }; void diff --git a/sys/dev/onewire/onewire.c b/sys/dev/onewire/onewire.c index 0213ed46d07..2eff045fbd2 100644 --- a/sys/dev/onewire/onewire.c +++ b/sys/dev/onewire/onewire.c @@ -1,4 +1,4 @@ -/* $NetBSD: onewire.c,v 1.14 2011/08/31 12:17:51 mbalmer Exp $ */ +/* $NetBSD: onewire.c,v 1.15 2014/03/16 05:20:28 dholland Exp $ */ /* $OpenBSD: onewire.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.14 2011/08/31 12:17:51 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.15 2014/03/16 05:20:28 dholland Exp $"); /* * 1-Wire bus driver. @@ -80,8 +80,17 @@ CFATTACH_DECL_NEW(onewire, sizeof(struct onewire_softc), onewire_match, onewire_attach, onewire_detach, onewire_activate); const struct cdevsw onewire_cdevsw = { - noopen, noclose, noread, nowrite, noioctl, nostop, notty, - nopoll, nommap, nokqfilter, D_OTHER, + .d_open = noopen, + .d_close = noclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver onewire_cd; diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c index a0791e66cb6..51532335bc6 100644 --- a/sys/dev/pci/agp.c +++ b/sys/dev/pci/agp.c @@ -1,4 +1,4 @@ -/* $NetBSD: agp.c,v 1.80 2012/04/06 20:24:28 plunky Exp $ */ +/* $NetBSD: agp.c,v 1.81 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -65,7 +65,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.80 2012/04/06 20:24:28 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.81 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1102,8 +1102,17 @@ agpmmap(dev_t dev, off_t offset, int prot) } const struct cdevsw agp_cdevsw = { - agpopen, agpclose, noread, nowrite, agpioctl, - nostop, notty, nopoll, agpmmap, nokqfilter, D_OTHER + .d_open = agpopen, + .d_close = agpclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = agpioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = agpmmap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* Implementation of the kernel api */ diff --git a/sys/dev/pci/amr.c b/sys/dev/pci/amr.c index a40955e3bcb..01639ef653a 100644 --- a/sys/dev/pci/amr.c +++ b/sys/dev/pci/amr.c @@ -1,4 +1,4 @@ -/* $NetBSD: amr.c,v 1.55 2012/07/27 16:25:11 jakllsch Exp $ */ +/* $NetBSD: amr.c,v 1.56 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.55 2012/07/27 16:25:11 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.56 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -116,8 +116,17 @@ CFATTACH_DECL_NEW(amr, sizeof(struct amr_softc), amr_match, amr_attach, NULL, NULL); const struct cdevsw amr_cdevsw = { - amropen, amrclose, noread, nowrite, amrioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = amropen, + .d_close = amrclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = amrioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver amr_cd; diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 52633c22a47..16913e9ffde 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,6 +1,6 @@ /* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */ -/* $NetBSD: bktr_os.c,v 1.62 2013/08/10 18:14:21 dholland Exp $ */ +/* $NetBSD: bktr_os.c,v 1.63 2014/03/16 05:20:28 dholland Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */ /* @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.62 2013/08/10 18:14:21 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.63 2014/03/16 05:20:28 dholland Exp $"); #ifdef __FreeBSD__ #include "bktr.h" @@ -180,8 +180,17 @@ dev_type_ioctl(bktr_ioctl); dev_type_mmap(bktr_mmap); const struct cdevsw bktr_cdevsw = { - bktr_open, bktr_close, bktr_read, bktr_write, bktr_ioctl, - nostop, notty, nopoll, bktr_mmap, nokqfilter, D_OTHER + .d_open = bktr_open, + .d_close = bktr_close, + .d_read = bktr_read, + .d_write = bktr_write, + .d_ioctl = bktr_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = bktr_mmap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; #endif /* __NetBSD __ */ diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index b2960054988..b0e5c795252 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $NetBSD: cz.c,v 1.57 2013/09/12 19:37:19 martin Exp $ */ +/* $NetBSD: cz.c,v 1.58 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.57 2013/09/12 19:37:19 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.58 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1535,8 +1535,17 @@ cztty_diag(void *arg) } const struct cdevsw cz_cdevsw = { - czttyopen, czttyclose, czttyread, czttywrite, czttyioctl, - czttystop, czttytty, czttypoll, nommap, ttykqfilter, D_TTY + .d_open = czttyopen, + .d_close = czttyclose, + .d_read = czttyread, + .d_write = czttywrite, + .d_ioctl = czttyioctl, + .d_stop = czttystop, + .d_tty = czttytty, + .d_poll = czttypoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; /* diff --git a/sys/dev/pci/hdaudio/hdaudio.c b/sys/dev/pci/hdaudio/hdaudio.c index a153250c7bf..c0f1b43b2d7 100644 --- a/sys/dev/pci/hdaudio/hdaudio.c +++ b/sys/dev/pci/hdaudio/hdaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdaudio.c,v 1.20 2013/10/16 18:20:17 christos Exp $ */ +/* $NetBSD: hdaudio.c,v 1.21 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk> @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.20 2013/10/16 18:20:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.21 2014/03/16 05:20:28 dholland Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -58,9 +58,17 @@ dev_type_close(hdaudioclose); dev_type_ioctl(hdaudioioctl); const struct cdevsw hdaudio_cdevsw = { - hdaudioopen, hdaudioclose, noread, nowrite, hdaudioioctl, - nostop, notty, nopoll, nommap, nokqfilter, - D_OTHER + .d_open = hdaudioopen, + .d_close = hdaudioclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = hdaudioioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; extern struct cfdriver hdaudio_cd; diff --git a/sys/dev/pci/mly.c b/sys/dev/pci/mly.c index 379ea68efb0..3aa4d14beff 100644 --- a/sys/dev/pci/mly.c +++ b/sys/dev/pci/mly.c @@ -1,4 +1,4 @@ -/* $NetBSD: mly.c,v 1.46 2013/10/17 21:06:15 christos Exp $ */ +/* $NetBSD: mly.c,v 1.47 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.46 2013/10/17 21:06:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.47 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -162,8 +162,17 @@ dev_type_close(mlyclose); dev_type_ioctl(mlyioctl); const struct cdevsw mly_cdevsw = { - mlyopen, mlyclose, noread, nowrite, mlyioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = mlyopen, + .d_close = mlyclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = mlyioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static struct mly_ident { diff --git a/sys/dev/pci/pci_usrreq.c b/sys/dev/pci/pci_usrreq.c index ecd4d968737..fe9d892a91a 100644 --- a/sys/dev/pci/pci_usrreq.c +++ b/sys/dev/pci/pci_usrreq.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_usrreq.c,v 1.24 2012/03/13 18:40:32 elad Exp $ */ +/* $NetBSD: pci_usrreq.c,v 1.25 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.24 2012/03/13 18:40:32 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.25 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -170,8 +170,17 @@ pcimmap(dev_t dev, off_t offset, int prot) } const struct cdevsw pci_cdevsw = { - pciopen, nullclose, noread, nowrite, pciioctl, - nostop, notty, nopoll, pcimmap, nokqfilter, D_OTHER, + .d_open = pciopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = pciioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = pcimmap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c index d2d6a806af1..5e861d0c4c4 100644 --- a/sys/dev/pci/twa.c +++ b/sys/dev/pci/twa.c @@ -1,4 +1,4 @@ -/* $NetBSD: twa.c,v 1.47 2014/03/13 16:34:13 hannken Exp $ */ +/* $NetBSD: twa.c,v 1.48 2014/03/16 05:20:28 dholland Exp $ */ /* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */ /*- @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.47 2014/03/13 16:34:13 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.48 2014/03/16 05:20:28 dholland Exp $"); //#define TWA_DEBUG @@ -2273,8 +2273,17 @@ fw_passthru_done: } const struct cdevsw twa_cdevsw = { - twaopen, twaclose, noread, nowrite, twaioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = twaopen, + .d_close = twaclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = twaioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c index 885f72955ae..8bb6292362c 100644 --- a/sys/dev/pci/twe.c +++ b/sys/dev/pci/twe.c @@ -1,4 +1,4 @@ -/* $NetBSD: twe.c,v 1.100 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: twe.c,v 1.101 2014/03/16 05:20:28 dholland Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.100 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.101 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1881,8 +1881,17 @@ done: } const struct cdevsw twe_cdevsw = { - tweopen, tweclose, noread, nowrite, tweioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = tweopen, + .d_close = tweclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = tweioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c index a038f54473a..c787fbffb54 100644 --- a/sys/dev/ppbus/lpt.c +++ b/sys/dev/ppbus/lpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt.c,v 1.28 2008/12/16 22:35:34 christos Exp $ */ +/* $NetBSD: lpt.c,v 1.29 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 1990 William F. Jolitz, TeleMuse @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.28 2008/12/16 22:35:34 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.29 2014/03/16 05:20:28 dholland Exp $"); #include "opt_ppbus_lpt.h" @@ -110,8 +110,17 @@ dev_type_write(lptwrite); dev_type_ioctl(lptioctl); const struct cdevsw lpt_cdevsw = { - lptopen, lptclose, lptread, lptwrite, lptioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = lptopen, + .d_close = lptclose, + .d_read = lptread, + .d_write = lptwrite, + .d_ioctl = lptioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; diff --git a/sys/dev/ppbus/pps_ppbus.c b/sys/dev/ppbus/pps_ppbus.c index 0df6714a69b..f1af5a05234 100644 --- a/sys/dev/ppbus/pps_ppbus.c +++ b/sys/dev/ppbus/pps_ppbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: pps_ppbus.c,v 1.14 2008/06/11 19:28:52 cegger Exp $ */ +/* $NetBSD: pps_ppbus.c,v 1.15 2014/03/16 05:20:28 dholland Exp $ */ /* * ported to timecounters by Frank Kardel 2006 @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pps_ppbus.c,v 1.14 2008/06/11 19:28:52 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pps_ppbus.c,v 1.15 2014/03/16 05:20:28 dholland Exp $"); #include "opt_ntp.h" @@ -62,8 +62,17 @@ static dev_type_open(ppsopen); static dev_type_close(ppsclose); static dev_type_ioctl(ppsioctl); const struct cdevsw pps_cdevsw = { - ppsopen, ppsclose, noread, nowrite, ppsioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = ppsopen, + .d_close = ppsclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = ppsioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static void ppsintr(void *arg); diff --git a/sys/dev/putter/putter.c b/sys/dev/putter/putter.c index 21bf41d4d13..61705bd194f 100644 --- a/sys/dev/putter/putter.c +++ b/sys/dev/putter/putter.c @@ -1,4 +1,4 @@ -/* $NetBSD: putter.c,v 1.33 2012/07/26 10:13:33 yamt Exp $ */ +/* $NetBSD: putter.c,v 1.34 2014/03/16 05:20:28 dholland Exp $ */ /* * Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.33 2012/07/26 10:13:33 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.34 2014/03/16 05:20:28 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,9 +62,17 @@ dev_type_ioctl(puttercdioctl); /* dev */ const struct cdevsw putter_cdevsw = { - puttercdopen, puttercdclose, noread, nowrite, - noioctl, nostop, notty, nopoll, - nommap, nokqfilter, D_OTHER + .d_open = puttercdopen, + .d_close = puttercdclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* diff --git a/sys/dev/qbus/dl.c b/sys/dev/qbus/dl.c index 71b7817de2c..6142f8ce359 100644 --- a/sys/dev/qbus/dl.c +++ b/sys/dev/qbus/dl.c @@ -1,4 +1,4 @@ -/* $NetBSD: dl.c,v 1.47 2012/10/27 17:18:37 chs Exp $ */ +/* $NetBSD: dl.c,v 1.48 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -104,7 +104,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.47 2012/10/27 17:18:37 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.48 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -158,8 +158,17 @@ dev_type_tty(dltty); dev_type_poll(dlpoll); const struct cdevsw dl_cdevsw = { - dlopen, dlclose, dlread, dlwrite, dlioctl, - dlstop, dltty, dlpoll, nommap, ttykqfilter, D_TTY + .d_open = dlopen, + .d_close = dlclose, + .d_read = dlread, + .d_write = dlwrite, + .d_ioctl = dlioctl, + .d_stop = dlstop, + .d_tty = dltty, + .d_poll = dlpoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; #define DL_READ_WORD(reg) \ diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c index 5961abdfb63..79911055625 100644 --- a/sys/dev/qbus/qd.c +++ b/sys/dev/qbus/qd.c @@ -1,4 +1,4 @@ -/* $NetBSD: qd.c,v 1.53 2012/10/27 17:18:37 chs Exp $ */ +/* $NetBSD: qd.c,v 1.54 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1988 Regents of the University of California. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.53 2012/10/27 17:18:37 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.54 2014/03/16 05:20:29 dholland Exp $"); #include "opt_ddb.h" @@ -344,8 +344,17 @@ dev_type_poll(qdpoll); dev_type_kqfilter(qdkqfilter); const struct cdevsw qd_cdevsw = { - qdopen, qdclose, qdread, qdwrite, qdioctl, - qdstop, notty, qdpoll, nommap, qdkqfilter, + .d_open = qdopen, + .d_close = qdclose, + .d_read = qdread, + .d_write = qdwrite, + .d_ioctl = qdioctl, + .d_stop = qdstop, + .d_tty = notty, + .d_poll = qdpoll, + .d_mmap = nommap, + .d_kqfilter = qdkqfilter, + .d_flag = 0 }; /* diff --git a/sys/dev/qbus/rf.c b/sys/dev/qbus/rf.c index 2b36fcc20b5..2a993ea2f9c 100644 --- a/sys/dev/qbus/rf.c +++ b/sys/dev/qbus/rf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf.c,v 1.25 2012/10/27 17:18:37 chs Exp $ */ +/* $NetBSD: rf.c,v 1.26 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 2002 Jochen Kunz. * All rights reserved. @@ -36,7 +36,7 @@ TODO: */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.25 2012/10/27 17:18:37 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.26 2014/03/16 05:20:29 dholland Exp $"); /* autoconfig stuff */ #include <sys/param.h> @@ -117,27 +117,27 @@ dev_type_size(rfsize); /* Entries in block and character major device number switch table. */ const struct bdevsw rf_bdevsw = { - rfopen, - rfclose, - rfstrategy, - rfioctl, - rfdump, - rfsize, - D_DISK + .d_open = rfopen, + .d_close = rfclose, + .d_strategy = rfstrategy, + .d_ioctl = rfioctl, + .d_dump = rfdump, + .d_psize = rfsize, + .d_flag = D_DISK }; const struct cdevsw rf_cdevsw = { - rfopen, - rfclose, - rfread, - rfwrite, - rfioctl, - nostop, - notty, - nopoll, - nommap, - nokqfilter, - D_DISK + .d_open = rfopen, + .d_close = rfclose, + .d_read = rfread, + .d_write = rfwrite, + .d_ioctl = rfioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c index d6ca4a4edee..4847e883f59 100644 --- a/sys/dev/qbus/rl.c +++ b/sys/dev/qbus/rl.c @@ -1,4 +1,4 @@ -/* $NetBSD: rl.c,v 1.42 2009/04/18 14:58:03 tsutsui Exp $ */ +/* $NetBSD: rl.c,v 1.43 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.42 2009/04/18 14:58:03 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.43 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -96,12 +96,27 @@ static dev_type_dump(rldump); static dev_type_size(rlpsize); const struct bdevsw rl_bdevsw = { - rlopen, rlclose, rlstrategy, rlioctl, rldump, rlpsize, D_DISK + .d_open = rlopen, + .d_close = rlclose, + .d_strategy = rlstrategy, + .d_ioctl = rlioctl, + .d_dump = rldump, + .d_psize = rlpsize, + .d_flag = D_DISK }; const struct cdevsw rl_cdevsw = { - rlopen, rlclose, rlread, rlwrite, rlioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = rlopen, + .d_close = rlclose, + .d_read = rlread, + .d_write = rlwrite, + .d_ioctl = rlioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; #define MAXRLXFER (RL_BPS * RL_SPT) diff --git a/sys/dev/qbus/ts.c b/sys/dev/qbus/ts.c index fd47f182f06..3360d389f65 100644 --- a/sys/dev/qbus/ts.c +++ b/sys/dev/qbus/ts.c @@ -1,4 +1,4 @@ -/* $NetBSD: ts.c,v 1.28 2010/12/15 00:08:43 matt Exp $ */ +/* $NetBSD: ts.c,v 1.29 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.28 2010/12/15 00:08:43 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.29 2014/03/16 05:20:29 dholland Exp $"); #undef TSDEBUG @@ -177,12 +177,27 @@ dev_type_strategy(tsstrategy); dev_type_dump(tsdump); const struct bdevsw ts_bdevsw = { - tsopen, tsclose, tsstrategy, tsioctl, tsdump, nosize, D_TAPE + .d_open = tsopen, + .d_close = tsclose, + .d_strategy = tsstrategy, + .d_ioctl = tsioctl, + .d_dump = tsdump, + .d_psize = nosize, + .d_flag = D_TAPE }; const struct cdevsw ts_cdevsw = { - tsopen, tsclose, tsread, tswrite, tsioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_TAPE + .d_open = tsopen, + .d_close = tsclose, + .d_read = tsread, + .d_write = tswrite, + .d_ioctl = tsioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_TAPE }; /* Bits in minor device */ diff --git a/sys/dev/radio.c b/sys/dev/radio.c index e9086fd19c5..4fefd53ae70 100644 --- a/sys/dev/radio.c +++ b/sys/dev/radio.c @@ -1,4 +1,4 @@ -/* $NetBSD: radio.c,v 1.25 2011/02/23 16:20:30 dyoung Exp $ */ +/* $NetBSD: radio.c,v 1.26 2014/03/16 05:20:26 dholland Exp $ */ /* $OpenBSD: radio.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */ /* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */ @@ -30,7 +30,7 @@ /* This is the /dev/radio driver from OpenBSD */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.25 2011/02/23 16:20:30 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.26 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,8 +63,17 @@ static dev_type_close(radioclose); static dev_type_ioctl(radioioctl); const struct cdevsw radio_cdevsw = { - radioopen, radioclose, noread, nowrite, radioioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = radioopen, + .d_close = radioclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = radioioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER, }; extern struct cfdriver radio_cd; diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index fc15d1abd97..2fbdf7bb5aa 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.304 2013/05/29 00:47:49 christos Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.305 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ ***********************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.304 2013/05/29 00:47:49 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.305 2014/03/16 05:20:29 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -205,13 +205,27 @@ dev_type_dump(raiddump); dev_type_size(raidsize); const struct bdevsw raid_bdevsw = { - raidopen, raidclose, raidstrategy, raidioctl, - raiddump, raidsize, D_DISK + .d_open = raidopen, + .d_close = raidclose, + .d_strategy = raidstrategy, + .d_ioctl = raidioctl, + .d_dump = raiddump, + .d_psize = raidsize, + .d_flag = D_DISK }; const struct cdevsw raid_cdevsw = { - raidopen, raidclose, raidread, raidwrite, raidioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = raidopen, + .d_close = raidclose, + .d_read = raidread, + .d_write = raidwrite, + .d_ioctl = raidioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver rf_dkdriver = { raidstrategy, minphys }; diff --git a/sys/dev/rndpseudo.c b/sys/dev/rndpseudo.c index 90442910e0b..09201373968 100644 --- a/sys/dev/rndpseudo.c +++ b/sys/dev/rndpseudo.c @@ -1,4 +1,4 @@ -/* $NetBSD: rndpseudo.c,v 1.18 2014/03/11 20:35:47 pooka Exp $ */ +/* $NetBSD: rndpseudo.c,v 1.19 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 1997-2013 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.18 2014/03/11 20:35:47 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.19 2014/03/16 05:20:26 dholland Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -127,8 +127,17 @@ void rndattach(int); dev_type_open(rndopen); const struct cdevsw rnd_cdevsw = { - rndopen, noclose, noread, nowrite, noioctl, nostop, - notty, nopoll, nommap, nokqfilter, D_OTHER|D_MPSAFE + .d_open = rndopen, + .d_close = noclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER | D_MPSAFE }; static int rnd_read(struct file *, off_t *, struct uio *, kauth_cred_t, int); diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c index a7cd6d6363d..9a1b07d6851 100644 --- a/sys/dev/sbus/bpp.c +++ b/sys/dev/sbus/bpp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bpp.c,v 1.39 2009/09/17 16:28:12 tsutsui Exp $ */ +/* $NetBSD: bpp.c,v 1.40 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.39 2009/09/17 16:28:12 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.40 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/ioctl.h> @@ -126,8 +126,17 @@ dev_type_poll(bpppoll); dev_type_kqfilter(bppkqfilter); const struct cdevsw bpp_cdevsw = { - bppopen, bppclose, noread, bppwrite, bppioctl, - nostop, notty, bpppoll, nommap, bppkqfilter, D_TTY + .d_open = bppopen, + .d_close = bppclose, + .d_read = noread, + .d_write = bppwrite, + .d_ioctl = bppioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = bpppoll, + .d_mmap = nommap, + .d_kqfilter = bppkqfilter, + .d_flag = D_TTY }; #define BPPUNIT(dev) (minor(dev)) diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c index 43e6e529658..5da1f01fb26 100644 --- a/sys/dev/sbus/magma.c +++ b/sys/dev/sbus/magma.c @@ -1,4 +1,4 @@ -/* $NetBSD: magma.c,v 1.57 2013/10/19 21:00:32 mrg Exp $ */ +/* $NetBSD: magma.c,v 1.58 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998 Iain Hibbert @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.57 2013/10/19 21:00:32 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.58 2014/03/16 05:20:29 dholland Exp $"); #if 0 #define MAGMA_DEBUG @@ -188,8 +188,17 @@ dev_type_tty(mttytty); dev_type_poll(mttypoll); const struct cdevsw mtty_cdevsw = { - mttyopen, mttyclose, mttyread, mttywrite, mttyioctl, - mttystop, mttytty, mttypoll, nommap, ttykqfilter, D_TTY + .d_open = mttyopen, + .d_close = mttyclose, + .d_read = mttyread, + .d_write = mttywrite, + .d_ioctl = mttyioctl, + .d_stop = mttystop, + .d_tty = mttytty, + .d_poll = mttypoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; dev_type_open(mbppopen); @@ -198,8 +207,17 @@ dev_type_read(mbpp_rw); dev_type_ioctl(mbppioctl); const struct cdevsw mbpp_cdevsw = { - mbppopen, mbppclose, mbpp_rw, mbpp_rw, mbppioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = mbppopen, + .d_close = mbppclose, + .d_read = mbpp_rw, + .d_write = mbpp_rw, + .d_ioctl = mbppioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /************************************************************************ diff --git a/sys/dev/sbus/p9100.c b/sys/dev/sbus/p9100.c index 98d2e10328e..19c94d6998f 100644 --- a/sys/dev/sbus/p9100.c +++ b/sys/dev/sbus/p9100.c @@ -1,4 +1,4 @@ -/* $NetBSD: p9100.c,v 1.60 2013/11/19 10:49:00 macallan Exp $ */ +/* $NetBSD: p9100.c,v 1.61 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.60 2013/11/19 10:49:00 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.61 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -173,8 +173,17 @@ static dev_type_ioctl(p9100ioctl); static dev_type_mmap(p9100mmap); const struct cdevsw pnozz_cdevsw = { - p9100open, nullclose, noread, nowrite, p9100ioctl, - nostop, notty, nopoll, p9100mmap, nokqfilter, + .d_open = p9100open, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = p9100ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = p9100mmap, + .d_kqfilter = nokqfilter, + .d_flag = 0 }; /* frame buffer generic driver */ diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c index 8c9cbe684fd..0f1874b100c 100644 --- a/sys/dev/sbus/spif.c +++ b/sys/dev/sbus/spif.c @@ -1,4 +1,4 @@ -/* $NetBSD: spif.c,v 1.29 2013/09/15 14:04:04 martin Exp $ */ +/* $NetBSD: spif.c,v 1.30 2014/03/16 05:20:29 dholland Exp $ */ /* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.29 2013/09/15 14:04:04 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.30 2014/03/16 05:20:29 dholland Exp $"); #include "spif.h" #if NSPIF > 0 @@ -94,8 +94,17 @@ dev_type_tty(stty_tty); dev_type_poll(stty_poll); const struct cdevsw stty_cdevsw = { - stty_open, stty_close, stty_read, stty_write, stty_ioctl, - stty_stop, stty_tty, stty_poll, nommap, ttykqfilter, D_TTY + .d_open = stty_open, + .d_close = stty_close, + .d_read = stty_read, + .d_write = stty_write, + .d_ioctl = stty_ioctl, + .d_stop = stty_stop, + .d_tty = stty_tty, + .d_poll = stty_poll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; dev_type_open(sbpp_open); @@ -106,8 +115,17 @@ dev_type_ioctl(sbpp_ioctl); dev_type_poll(sbpp_poll); const struct cdevsw sbpp_cdevsw = { - sbpp_open, sbpp_close, sbpp_read, sbpp_write, sbpp_ioctl, - nostop, notty, sbpp_poll, nommap, nokqfilter, D_OTHER + .d_open = sbpp_open, + .d_close = sbpp_close, + .d_read = sbpp_read, + .d_write = sbpp_write, + .d_ioctl = sbpp_ioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = sbpp_poll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; diff --git a/sys/dev/sbus/tcx.c b/sys/dev/sbus/tcx.c index d43cd6aa44d..87b9191b765 100644 --- a/sys/dev/sbus/tcx.c +++ b/sys/dev/sbus/tcx.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcx.c,v 1.44 2012/01/11 16:08:57 macallan Exp $ */ +/* $NetBSD: tcx.c,v 1.45 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.44 2012/01/11 16:08:57 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.45 2014/03/16 05:20:29 dholland Exp $"); /* * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5; @@ -158,8 +158,17 @@ dev_type_ioctl(tcxioctl); dev_type_mmap(tcxmmap); const struct cdevsw tcx_cdevsw = { - tcxopen, tcxclose, noread, nowrite, tcxioctl, - nostop, notty, nopoll, tcxmmap, nokqfilter, + .d_open = tcxopen, + .d_close = tcxclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = tcxioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = tcxmmap, + .d_kqfilter = nokqfilter, + .d_flag = 0 }; /* frame buffer generic driver */ diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c index 84794985077..bf5485ef318 100644 --- a/sys/dev/scsipi/cd.c +++ b/sys/dev/scsipi/cd.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd.c,v 1.316 2013/10/25 11:35:55 martin Exp $ */ +/* $NetBSD: cd.c,v 1.317 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation, @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.316 2013/10/25 11:35:55 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.317 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -204,12 +204,27 @@ static dev_type_dump(cddump); static dev_type_size(cdsize); const struct bdevsw cd_bdevsw = { - cdopen, cdclose, cdstrategy, cdioctl, cddump, cdsize, D_DISK + .d_open = cdopen, + .d_close = cdclose, + .d_strategy = cdstrategy, + .d_ioctl = cdioctl, + .d_dump = cddump, + .d_psize = cdsize, + .d_flag = D_DISK }; const struct cdevsw cd_cdevsw = { - cdopen, cdclose, cdread, cdwrite, cdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = cdopen, + .d_close = cdclose, + .d_read = cdread, + .d_write = cdwrite, + .d_ioctl = cdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver cddkdriver = { cdstrategy, NULL }; diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c index b062074d20a..f8bdfb2fc20 100644 --- a/sys/dev/scsipi/ch.c +++ b/sys/dev/scsipi/ch.c @@ -1,4 +1,4 @@ -/* $NetBSD: ch.c,v 1.88 2013/08/09 19:58:44 kardel Exp $ */ +/* $NetBSD: ch.c,v 1.89 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.88 2013/08/09 19:58:44 kardel Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.89 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -121,8 +121,17 @@ static dev_type_poll(chpoll); static dev_type_kqfilter(chkqfilter); const struct cdevsw ch_cdevsw = { - chopen, chclose, chread, nowrite, chioctl, - nostop, notty, chpoll, nommap, chkqfilter, D_OTHER + .d_open = chopen, + .d_close = chclose, + .d_read = chread, + .d_write = nowrite, + .d_ioctl = chioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = chpoll, + .d_mmap = nommap, + .d_kqfilter = chkqfilter, + .d_flag = D_OTHER }; /* SCSI glue */ diff --git a/sys/dev/scsipi/if_se.c b/sys/dev/scsipi/if_se.c index 3c71b1f1a2b..67ef7612421 100644 --- a/sys/dev/scsipi/if_se.c +++ b/sys/dev/scsipi/if_se.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_se.c,v 1.85 2012/10/27 17:18:38 chs Exp $ */ +/* $NetBSD: if_se.c,v 1.86 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1997 Ian W. Dall <ian.dall@dsto.defence.gov.au> @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.85 2012/10/27 17:18:38 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.86 2014/03/16 05:20:29 dholland Exp $"); #include "opt_inet.h" #include "opt_atalk.h" @@ -237,8 +237,17 @@ dev_type_close(seclose); dev_type_ioctl(seioctl); const struct cdevsw se_cdevsw = { - seopen, seclose, noread, nowrite, seioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER + .d_open = seopen, + .d_close = seclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = seioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; const struct scsipi_periphsw se_switch = { diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c index a8e8f2b402f..42be458707a 100644 --- a/sys/dev/scsipi/scsiconf.c +++ b/sys/dev/scsipi/scsiconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: scsiconf.c,v 1.271 2013/10/12 16:49:01 christos Exp $ */ +/* $NetBSD: scsiconf.c,v 1.272 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.271 2013/10/12 16:49:01 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.272 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -106,8 +106,17 @@ static dev_type_close(scsibusclose); static dev_type_ioctl(scsibusioctl); const struct cdevsw scsibus_cdevsw = { - scsibusopen, scsibusclose, noread, nowrite, scsibusioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = scsibusopen, + .d_close = scsibusclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = scsibusioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static int scsibusprint(void *, const char *); diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c index 6a74a3b131b..45db8527a2c 100644 --- a/sys/dev/scsipi/sd.c +++ b/sys/dev/scsipi/sd.c @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.304 2013/10/25 16:03:51 martin Exp $ */ +/* $NetBSD: sd.c,v 1.305 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.304 2013/10/25 16:03:51 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.305 2014/03/16 05:20:29 dholland Exp $"); #include "opt_scsi.h" @@ -157,12 +157,27 @@ static dev_type_dump(sddump); static dev_type_size(sdsize); const struct bdevsw sd_bdevsw = { - sdopen, sdclose, sdstrategy, sdioctl, sddump, sdsize, D_DISK + .d_open = sdopen, + .d_close = sdclose, + .d_strategy = sdstrategy, + .d_ioctl = sdioctl, + .d_dump = sddump, + .d_psize = sdsize, + .d_flag = D_DISK }; const struct cdevsw sd_cdevsw = { - sdopen, sdclose, sdread, sdwrite, sdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = sdopen, + .d_close = sdclose, + .d_read = sdread, + .d_write = sdwrite, + .d_ioctl = sdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static struct dkdriver sddkdriver = { sdstrategy, sdminphys }; diff --git a/sys/dev/scsipi/ses.c b/sys/dev/scsipi/ses.c index 46683bf99a9..410b0a15b39 100644 --- a/sys/dev/scsipi/ses.c +++ b/sys/dev/scsipi/ses.c @@ -1,4 +1,4 @@ -/* $NetBSD: ses.c,v 1.45 2013/04/07 18:50:33 wiz Exp $ */ +/* $NetBSD: ses.c,v 1.46 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (C) 2000 National Aeronautics & Space Administration * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.45 2013/04/07 18:50:33 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.46 2014/03/16 05:20:29 dholland Exp $"); #include "opt_scsi.h" @@ -137,8 +137,17 @@ static dev_type_close(sesclose); static dev_type_ioctl(sesioctl); const struct cdevsw ses_cdevsw = { - sesopen, sesclose, noread, nowrite, sesioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = sesopen, + .d_close = sesclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = sesioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static int ses_runcmd(struct ses_softc *, char *, int, char *, int *); diff --git a/sys/dev/scsipi/ss.c b/sys/dev/scsipi/ss.c index f64d9f395e1..cefb7b8bf04 100644 --- a/sys/dev/scsipi/ss.c +++ b/sys/dev/scsipi/ss.c @@ -1,4 +1,4 @@ -/* $NetBSD: ss.c,v 1.84 2012/02/28 14:04:19 mbalmer Exp $ */ +/* $NetBSD: ss.c,v 1.85 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1995 Kenneth Stailey. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.84 2012/02/28 14:04:19 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.85 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,8 +89,17 @@ static dev_type_read(ssread); static dev_type_ioctl(ssioctl); const struct cdevsw ss_cdevsw = { - ssopen, ssclose, ssread, nowrite, ssioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = ssopen, + .d_close = ssclose, + .d_read = ssread, + .d_write = nowrite, + .d_ioctl = ssioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static void ssstrategy(struct buf *); diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c index 1e23933020a..423aace8ba3 100644 --- a/sys/dev/scsipi/st.c +++ b/sys/dev/scsipi/st.c @@ -1,4 +1,4 @@ -/* $NetBSD: st.c,v 1.222 2013/10/25 16:06:44 martin Exp $ */ +/* $NetBSD: st.c,v 1.223 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.222 2013/10/25 16:06:44 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.223 2014/03/16 05:20:29 dholland Exp $"); #include "opt_scsi.h" @@ -105,12 +105,27 @@ static dev_type_strategy(ststrategy); static dev_type_dump(stdump); const struct bdevsw st_bdevsw = { - stopen, stclose, ststrategy, stioctl, stdump, nosize, D_TAPE + .d_open = stopen, + .d_close = stclose, + .d_strategy = ststrategy, + .d_ioctl = stioctl, + .d_dump = stdump, + .d_psize = nosize, + .d_flag = D_TAPE }; const struct cdevsw st_cdevsw = { - stopen, stclose, stread, stwrite, stioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_TAPE + .d_open = stopen, + .d_close = stclose, + .d_read = stread, + .d_write = stwrite, + .d_ioctl = stioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_TAPE }; /* diff --git a/sys/dev/scsipi/uk.c b/sys/dev/scsipi/uk.c index e198566bc79..153395e9d76 100644 --- a/sys/dev/scsipi/uk.c +++ b/sys/dev/scsipi/uk.c @@ -1,4 +1,4 @@ -/* $NetBSD: uk.c,v 1.60 2012/02/08 12:22:00 mbalmer Exp $ */ +/* $NetBSD: uk.c,v 1.61 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.60 2012/02/08 12:22:00 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.61 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,8 +76,17 @@ static dev_type_close(ukclose); static dev_type_ioctl(ukioctl); const struct cdevsw uk_cdevsw = { - ukopen, ukclose, noread, nowrite, ukioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = ukopen, + .d_close = ukclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = ukioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; static int diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index d8211206f7c..ee5551945e8 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $NetBSD: sequencer.c,v 1.57 2013/10/17 21:19:40 christos Exp $ */ +/* $NetBSD: sequencer.c,v 1.58 2014/03/16 05:20:26 dholland Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.57 2013/10/17 21:19:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.58 2014/03/16 05:20:26 dholland Exp $"); #include "sequencer.h" @@ -157,9 +157,17 @@ static dev_type_poll(sequencerpoll); static dev_type_kqfilter(sequencerkqfilter); const struct cdevsw sequencer_cdevsw = { - sequenceropen, sequencerclose, sequencerread, sequencerwrite, - sequencerioctl, nostop, notty, sequencerpoll, nommap, - sequencerkqfilter, D_OTHER | D_MPSAFE + .d_open = sequenceropen, + .d_close = sequencerclose, + .d_read = sequencerread, + .d_write = sequencerwrite, + .d_ioctl = sequencerioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = sequencerpoll, + .d_mmap = nommap, + .d_kqfilter = sequencerkqfilter, + .d_flag = D_OTHER | D_MPSAFE }; static LIST_HEAD(, sequencer_softc) sequencers = LIST_HEAD_INITIALIZER(sequencers); static kmutex_t sequencer_lock; @@ -1587,8 +1595,17 @@ static dev_type_open(midiopen); static dev_type_close(midiclose); const struct cdevsw midi_cdevsw = { - midiopen, midiclose, noread, nowrite, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER | D_MPSAFE + .d_open = midiopen, + .d_close = midiclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER | D_MPSAFE }; /* diff --git a/sys/dev/sun/bwtwo.c b/sys/dev/sun/bwtwo.c index 443eebfaae9..91b544a691a 100644 --- a/sys/dev/sun/bwtwo.c +++ b/sys/dev/sun/bwtwo.c @@ -1,4 +1,4 @@ -/* $NetBSD: bwtwo.c,v 1.32 2014/02/20 02:09:28 joerg Exp $ */ +/* $NetBSD: bwtwo.c,v 1.33 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.32 2014/02/20 02:09:28 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.33 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -116,8 +116,17 @@ dev_type_ioctl(bwtwoioctl); dev_type_mmap(bwtwommap); const struct cdevsw bwtwo_cdevsw = { - bwtwoopen, nullclose, noread, nowrite, bwtwoioctl, - nostop, notty, nopoll, bwtwommap, nokqfilter, D_OTHER + .d_open = bwtwoopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = bwtwoioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = bwtwommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* XXX we do not handle frame buffer interrupts (do not know how) */ diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c index 61fe4bff7f6..90af2359782 100644 --- a/sys/dev/sun/cgsix.c +++ b/sys/dev/sun/cgsix.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix.c,v 1.63 2013/12/03 17:01:04 macallan Exp $ */ +/* $NetBSD: cgsix.c,v 1.64 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.63 2013/12/03 17:01:04 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.64 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -125,8 +125,17 @@ dev_type_ioctl(cgsixioctl); dev_type_mmap(cgsixmmap); const struct cdevsw cgsix_cdevsw = { - cgsixopen, cgsixclose, noread, nowrite, cgsixioctl, - nostop, notty, nopoll, cgsixmmap, nokqfilter, D_OTHER + .d_open = cgsixopen, + .d_close = cgsixclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = cgsixioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = cgsixmmap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* frame buffer generic driver */ diff --git a/sys/dev/sun/cgthree.c b/sys/dev/sun/cgthree.c index 5247f977f70..734a08a7235 100644 --- a/sys/dev/sun/cgthree.c +++ b/sys/dev/sun/cgthree.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgthree.c,v 1.29 2012/01/11 16:10:14 macallan Exp $ */ +/* $NetBSD: cgthree.c,v 1.30 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.29 2012/01/11 16:10:14 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.30 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,8 +81,17 @@ dev_type_ioctl(cgthreeioctl); dev_type_mmap(cgthreemmap); const struct cdevsw cgthree_cdevsw = { - cgthreeopen, nullclose, noread, nowrite, cgthreeioctl, - nostop, notty, nopoll, cgthreemmap, nokqfilter, D_OTHER + .d_open = cgthreeopen, + .d_close = nullclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = cgthreeioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = cgthreemmap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; /* frame buffer generic driver */ diff --git a/sys/dev/sun/fb.c b/sys/dev/sun/fb.c index 9b659afc038..b164d965d49 100644 --- a/sys/dev/sun/fb.c +++ b/sys/dev/sun/fb.c @@ -1,4 +1,4 @@ -/* $NetBSD: fb.c,v 1.33 2010/03/11 04:00:36 mrg Exp $ */ +/* $NetBSD: fb.c,v 1.34 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1992, 1993 @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.33 2010/03/11 04:00:36 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.34 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -87,8 +87,17 @@ dev_type_mmap(fbmmap); dev_type_kqfilter(fbkqfilter); const struct cdevsw fb_cdevsw = { - fbopen, fbclose, noread, nowrite, fbioctl, - nostop, notty, fbpoll, fbmmap, fbkqfilter, D_OTHER + .d_open = fbopen, + .d_close = fbclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = fbioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = fbpoll, + .d_mmap = fbmmap, + .d_kqfilter = fbkqfilter, + .d_flag = D_OTHER }; void diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c index 8afa9f8c47d..936c1cb33e3 100644 --- a/sys/dev/sun/kbd.c +++ b/sys/dev/sun/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.66 2012/05/02 14:54:26 christos Exp $ */ +/* $NetBSD: kbd.c,v 1.67 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1992, 1993 @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.66 2012/05/02 14:54:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.67 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,8 +89,17 @@ dev_type_poll(kbdpoll); dev_type_kqfilter(kbdkqfilter); const struct cdevsw kbd_cdevsw = { - kbdopen, kbdclose, kbdread, nowrite, kbdioctl, - nostop, notty, kbdpoll, nommap, kbdkqfilter, D_OTHER + .d_open = kbdopen, + .d_close = kbdclose, + .d_read = kbdread, + .d_write = nowrite, + .d_ioctl = kbdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = kbdpoll, + .d_mmap = nommap, + .d_kqfilter = kbdkqfilter, + .d_flag = D_OTHER }; #if NWSKBD > 0 diff --git a/sys/dev/sun/ms.c b/sys/dev/sun/ms.c index 87c38d0054a..ff192111876 100644 --- a/sys/dev/sun/ms.c +++ b/sys/dev/sun/ms.c @@ -1,4 +1,4 @@ -/* $NetBSD: ms.c,v 1.38 2009/01/11 23:36:39 christos Exp $ */ +/* $NetBSD: ms.c,v 1.39 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1992, 1993 @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.38 2009/01/11 23:36:39 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.39 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,8 +90,17 @@ dev_type_poll(mspoll); dev_type_kqfilter(mskqfilter); const struct cdevsw ms_cdevsw = { - msopen, msclose, msread, nowrite, msioctl, - nostop, notty, mspoll, nommap, mskqfilter, D_OTHER + .d_open = msopen, + .d_close = msclose, + .d_read = msread, + .d_write = nowrite, + .d_ioctl = msioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = mspoll, + .d_mmap = nommap, + .d_kqfilter = mskqfilter, + .d_flag = D_OTHER }; /**************************************************************** diff --git a/sys/dev/sysmon/sysmon.c b/sys/dev/sysmon/sysmon.c index 5556936dad6..539af4c1371 100644 --- a/sys/dev/sysmon/sysmon.c +++ b/sys/dev/sysmon/sysmon.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon.c,v 1.17 2008/03/03 09:38:49 xtraeme Exp $ */ +/* $NetBSD: sysmon.c,v 1.18 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.17 2008/03/03 09:38:49 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.18 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -61,8 +61,17 @@ dev_type_poll(sysmonpoll); dev_type_kqfilter(sysmonkqfilter); const struct cdevsw sysmon_cdevsw = { - sysmonopen, sysmonclose, sysmonread, nowrite, sysmonioctl, - nostop, notty, sysmonpoll, nommap, sysmonkqfilter, D_OTHER | D_MPSAFE, + .d_open = sysmonopen, + .d_close = sysmonclose, + .d_read = sysmonread, + .d_write = nowrite, + .d_ioctl = sysmonioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = sysmonpoll, + .d_mmap = nommap, + .d_kqfilter = sysmonkqfilter, + .d_flag = D_OTHER | D_MPSAFE }; /* diff --git a/sys/dev/tc/stic.c b/sys/dev/tc/stic.c index 5d67b3a8198..4f3dec6981a 100644 --- a/sys/dev/tc/stic.c +++ b/sys/dev/tc/stic.c @@ -1,4 +1,4 @@ -/* $NetBSD: stic.c,v 1.49 2012/01/11 21:12:36 macallan Exp $ */ +/* $NetBSD: stic.c,v 1.50 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.49 2012/01/11 21:12:36 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.50 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -154,8 +154,17 @@ static dev_type_close(sticclose); static dev_type_mmap(sticmmap); const struct cdevsw stic_cdevsw = { - sticopen, sticclose, noread, nowrite, noioctl, - nostop, notty, nopoll, sticmmap, nokqfilter, + .d_open = sticopen, + .d_close = sticclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = noioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = sticmmap, + .d_kqfilter = nokqfilter, + .d_flag = 0 }; /* Colormap for wscons, matching WSCOL_*. Upper 8 are high-intensity. */ diff --git a/sys/dev/tprof/tprof.c b/sys/dev/tprof/tprof.c index 988ce4261fd..2f8229234c3 100644 --- a/sys/dev/tprof/tprof.c +++ b/sys/dev/tprof/tprof.c @@ -1,4 +1,4 @@ -/* $NetBSD: tprof.c,v 1.10 2011/04/14 16:23:59 yamt Exp $ */ +/* $NetBSD: tprof.c,v 1.11 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c)2008,2009,2010 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.10 2011/04/14 16:23:59 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.11 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -652,7 +652,7 @@ const struct cdevsw tprof_cdevsw = { .d_poll = nopoll, .d_mmap = nommap, .d_kqfilter = nokqfilter, - .d_flag = D_OTHER | D_MPSAFE, + .d_flag = D_OTHER | D_MPSAFE }; void diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 841f85e989a..0f86c49c691 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $NetBSD: ucom.c,v 1.102 2012/12/15 04:10:05 jakllsch Exp $ */ +/* $NetBSD: ucom.c,v 1.103 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.102 2012/12/15 04:10:05 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.103 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -154,8 +154,17 @@ dev_type_tty(ucomtty); dev_type_poll(ucompoll); const struct cdevsw ucom_cdevsw = { - ucomopen, ucomclose, ucomread, ucomwrite, ucomioctl, - ucomstop, ucomtty, ucompoll, nommap, ttykqfilter, D_TTY + .d_open = ucomopen, + .d_close = ucomclose, + .d_read = ucomread, + .d_write = ucomwrite, + .d_ioctl = ucomioctl, + .d_stop = ucomstop, + .d_tty = ucomtty, + .d_poll = ucompoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; static void ucom_cleanup(struct ucom_softc *); diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c index b51daba9fa3..4f8010ff8f4 100644 --- a/sys/dev/usb/ucycom.c +++ b/sys/dev/usb/ucycom.c @@ -1,4 +1,4 @@ -/* $NetBSD: ucycom.c,v 1.37 2013/10/14 18:15:12 skrll Exp $ */ +/* $NetBSD: ucycom.c,v 1.38 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.37 2013/10/14 18:15:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.38 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -148,8 +148,17 @@ dev_type_tty(ucycomtty); dev_type_poll(ucycompoll); const struct cdevsw ucycom_cdevsw = { - ucycomopen, ucycomclose, ucycomread, ucycomwrite, ucycomioctl, - ucycomstop, ucycomtty, ucycompoll, nommap, ttykqfilter, D_TTY + .d_open = ucycomopen, + .d_close = ucycomclose, + .d_read = ucycomread, + .d_write = ucycomwrite, + .d_ioctl = ucycomioctl, + .d_stop = ucycomstop, + .d_tty = ucycomtty, + .d_poll = ucycompoll, + .d_mmap = nommap, + .d_kqfilter = ttykqfilter, + .d_flag = D_TTY }; Static int ucycomparam(struct tty *, struct termios *); diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index d914a24fb75..06dca62c7f0 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.122 2013/01/05 01:30:16 christos Exp $ */ +/* $NetBSD: ugen.c,v 1.123 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.122 2013/01/05 01:30:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.123 2014/03/16 05:20:29 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -141,8 +141,17 @@ dev_type_poll(ugenpoll); dev_type_kqfilter(ugenkqfilter); const struct cdevsw ugen_cdevsw = { - ugenopen, ugenclose, ugenread, ugenwrite, ugenioctl, - nostop, notty, ugenpoll, nommap, ugenkqfilter, D_OTHER, + .d_open = ugenopen, + .d_close = ugenclose, + .d_read = ugenread, + .d_write = ugenwrite, + .d_ioctl = ugenioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = ugenpoll, + .d_mmap = nommap, + .d_kqfilter = ugenkqfilter, + .d_flag = D_OTHER, }; Static void ugenintr(usbd_xfer_handle xfer, usbd_private_handle addr, diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index de01c13a03c..cb79291cb68 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhid.c,v 1.89 2013/01/05 01:30:17 christos Exp $ */ +/* $NetBSD: uhid.c,v 1.90 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.89 2013/01/05 01:30:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.90 2014/03/16 05:20:29 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -116,8 +116,17 @@ dev_type_poll(uhidpoll); dev_type_kqfilter(uhidkqfilter); const struct cdevsw uhid_cdevsw = { - uhidopen, uhidclose, uhidread, uhidwrite, uhidioctl, - nostop, notty, uhidpoll, nommap, uhidkqfilter, D_OTHER | D_MPSAFE, + .d_open = uhidopen, + .d_close = uhidclose, + .d_read = uhidread, + .d_write = uhidwrite, + .d_ioctl = uhidioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = uhidpoll, + .d_mmap = nommap, + .d_kqfilter = uhidkqfilter, + .d_flag = D_OTHER | D_MPSAFE }; Static void uhid_intr(struct uhidev *, void *, u_int len); diff --git a/sys/dev/usb/uhso.c b/sys/dev/usb/uhso.c index 1a4de2e40de..9dd019a3020 100644 --- a/sys/dev/usb/uhso.c +++ b/sys/dev/usb/uhso.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhso.c,v 1.12 2014/02/25 18:30:10 pooka Exp $ */ +/* $NetBSD: uhso.c,v 1.13 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 2009 Iain Hibbert @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.12 2014/02/25 18:30:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.13 2014/03/16 05:20:29 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -388,7 +388,7 @@ const struct cdevsw uhso_cdevsw = { .d_poll = uhso_tty_poll, .d_mmap = nommap, .d_kqfilter = ttykqfilter, - .d_flag = D_TTY, + .d_flag = D_TTY }; Static int uhso_tty_init(struct uhso_port *); diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 674978a554a..3c39a6abeba 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ulpt.c,v 1.93 2013/09/15 15:46:33 martin Exp $ */ +/* $NetBSD: ulpt.c,v 1.94 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.93 2013/09/15 15:46:33 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.94 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -130,8 +130,17 @@ dev_type_read(ulptread); dev_type_ioctl(ulptioctl); const struct cdevsw ulpt_cdevsw = { - ulptopen, ulptclose, ulptread, ulptwrite, ulptioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = ulptopen, + .d_close = ulptclose, + .d_read = ulptread, + .d_write = ulptwrite, + .d_ioctl = ulptioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; void ulpt_disco(void *); diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index 7ce477aca31..2b1e63eb737 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -1,4 +1,4 @@ -/* $NetBSD: urio.c,v 1.40 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: urio.c,v 1.41 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.40 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.41 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,8 +75,17 @@ dev_type_write(uriowrite); dev_type_ioctl(urioioctl); const struct cdevsw urio_cdevsw = { - urioopen, urioclose, urioread, uriowrite, urioioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = urioopen, + .d_close = urioclose, + .d_read = urioread, + .d_write = uriowrite, + .d_ioctl = urioioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; #define URIO_CONFIG_NO 1 diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 062a2c5a1a4..0ec2818c87a 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $NetBSD: usb.c,v 1.148 2013/11/09 07:52:22 skrll Exp $ */ +/* $NetBSD: usb.c,v 1.149 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.148 2013/11/09 07:52:22 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.149 2014/03/16 05:20:29 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -117,8 +117,17 @@ dev_type_poll(usbpoll); dev_type_kqfilter(usbkqfilter); const struct cdevsw usb_cdevsw = { - usbopen, usbclose, usbread, nowrite, usbioctl, - nostop, notty, usbpoll, nommap, usbkqfilter, D_OTHER, + .d_open = usbopen, + .d_close = usbclose, + .d_read = usbread, + .d_write = nowrite, + .d_ioctl = usbioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = usbpoll, + .d_mmap = nommap, + .d_kqfilter = usbkqfilter, + .d_flag = D_OTHER }; Static void usb_discover(struct usb_softc *); diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 30e877dbe90..45a1b75e242 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $NetBSD: uscanner.c,v 1.73 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: uscanner.c,v 1.74 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.73 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.74 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -241,9 +241,17 @@ dev_type_poll(uscannerpoll); dev_type_kqfilter(uscannerkqfilter); const struct cdevsw uscanner_cdevsw = { - uscanneropen, uscannerclose, uscannerread, uscannerwrite, - uscannerioctl, nostop, notty, uscannerpoll, nommap, uscannerkqfilter, - D_OTHER, + .d_open = uscanneropen, + .d_close = uscannerclose, + .d_read = uscannerread, + .d_write = uscannerwrite, + .d_ioctl = uscannerioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = uscannerpoll, + .d_mmap = nommap, + .d_kqfilter = uscannerkqfilter, + .d_flag = D_OTHER }; Static int uscanner_do_read(struct uscanner_softc *, struct uio *, int); diff --git a/sys/dev/usb/utoppy.c b/sys/dev/usb/utoppy.c index a31a8401224..b549786d0e3 100644 --- a/sys/dev/usb/utoppy.c +++ b/sys/dev/usb/utoppy.c @@ -1,4 +1,4 @@ -/* $NetBSD: utoppy.c,v 1.22 2013/08/30 12:59:19 skrll Exp $ */ +/* $NetBSD: utoppy.c,v 1.23 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.22 2013/08/30 12:59:19 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.23 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -179,8 +179,17 @@ dev_type_write(utoppywrite); dev_type_ioctl(utoppyioctl); const struct cdevsw utoppy_cdevsw = { - utoppyopen, utoppyclose, utoppyread, utoppywrite, utoppyioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = utoppyopen, + .d_close = utoppyclose, + .d_read = utoppyread, + .d_write = utoppywrite, + .d_ioctl = utoppyioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; #define UTOPPYUNIT(n) (minor(n)) diff --git a/sys/dev/verified_exec.c b/sys/dev/verified_exec.c index 34d04ac22d1..15b0c381599 100644 --- a/sys/dev/verified_exec.c +++ b/sys/dev/verified_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: verified_exec.c,v 1.67 2012/03/13 18:40:30 elad Exp $ */ +/* $NetBSD: verified_exec.c,v 1.68 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 2005, 2006 Elad Efrat <elad@NetBSD.org> @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.67 2012/03/13 18:40:30 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.68 2014/03/16 05:20:26 dholland Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -69,20 +69,20 @@ struct veriexec_softc { #endif const struct cdevsw veriexec_cdevsw = { - veriexecopen, - veriexecclose, - noread, - nowrite, - veriexecioctl, + .d_open = veriexecopen, + .d_close = veriexecclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = veriexecioctl, #ifdef __NetBSD__ - nostop, - notty, + .d_stop = nostop, + .d_tty = notty, #endif - nopoll, - nommap, + .d_poll = nopoll, + .d_mmap = nommap, #if defined(__NetBSD__) - nokqfilter, - D_OTHER, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER, #elif defined(__FreeBSD__) nostrategy, "veriexec", diff --git a/sys/dev/video.c b/sys/dev/video.c index 1ef4f8e9ade..f30ea6daac0 100644 --- a/sys/dev/video.c +++ b/sys/dev/video.c @@ -1,4 +1,4 @@ -/* $NetBSD: video.c,v 1.30 2013/10/17 21:20:10 christos Exp $ */ +/* $NetBSD: video.c,v 1.31 2014/03/16 05:20:26 dholland Exp $ */ /* * Copyright (c) 2008 Patrick Mahoney <pat@polycrystal.org> @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.30 2013/10/17 21:20:10 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.31 2014/03/16 05:20:26 dholland Exp $"); #include "video.h" #if NVIDEO > 0 @@ -205,8 +205,17 @@ dev_type_poll(videopoll); dev_type_mmap(videommap); const struct cdevsw video_cdevsw = { - videoopen, videoclose, videoread, videowrite, videoioctl, - nostop, notty, videopoll, videommap, nokqfilter, D_OTHER + .d_open = videoopen, + .d_close = videoclose, + .d_read = videoread, + .d_write = videowrite, + .d_ioctl = videoioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = videopoll, + .d_mmap = videommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; #define VIDEOUNIT(n) (minor(n)) diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c index 60762ead3fa..a49436113ee 100644 --- a/sys/dev/vme/xd.c +++ b/sys/dev/vme/xd.c @@ -1,4 +1,4 @@ -/* $NetBSD: xd.c,v 1.90 2013/10/19 21:00:32 mrg Exp $ */ +/* $NetBSD: xd.c,v 1.91 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.90 2013/10/19 21:00:32 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.91 2014/03/16 05:20:29 dholland Exp $"); #undef XDC_DEBUG /* full debug */ #define XDC_DIAG /* extra sanity checks */ @@ -292,12 +292,27 @@ dev_type_dump(xddump); dev_type_size(xdsize); const struct bdevsw xd_bdevsw = { - xdopen, xdclose, xdstrategy, xdioctl, xddump, xdsize, D_DISK + .d_open = xdopen, + .d_close = xdclose, + .d_strategy = xdstrategy, + .d_ioctl = xdioctl, + .d_dump = xddump, + .d_psize = xdsize, + .d_flag = D_DISK }; const struct cdevsw xd_cdevsw = { - xdopen, xdclose, xdread, xdwrite, xdioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = xdopen, + .d_close = xdclose, + .d_read = xdread, + .d_write = xdwrite, + .d_ioctl = xdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; struct xdc_attach_args { /* this is the "aux" args to xdattach */ diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c index 516c6967e3e..00f8ff4c5b1 100644 --- a/sys/dev/vme/xy.c +++ b/sys/dev/vme/xy.c @@ -1,4 +1,4 @@ -/* $NetBSD: xy.c,v 1.94 2013/10/19 21:00:32 mrg Exp $ */ +/* $NetBSD: xy.c,v 1.95 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.94 2013/10/19 21:00:32 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.95 2014/03/16 05:20:29 dholland Exp $"); #undef XYC_DEBUG /* full debug */ #undef XYC_DIAG /* extra sanity checks */ @@ -208,12 +208,27 @@ dev_type_dump(xydump); dev_type_size(xysize); const struct bdevsw xy_bdevsw = { - xyopen, xyclose, xystrategy, xyioctl, xydump, xysize, D_DISK + .d_open = xyopen, + .d_close = xyclose, + .d_strategy = xystrategy, + .d_ioctl = xyioctl, + .d_dump = xydump, + .d_psize = xysize, + .d_flag = D_DISK }; const struct cdevsw xy_cdevsw = { - xyopen, xyclose, xyread, xywrite, xyioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = xyopen, + .d_close = xyclose, + .d_read = xyread, + .d_write = xywrite, + .d_ioctl = xyioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; struct xyc_attach_args { /* this is the "aux" args to xyattach */ diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index 6a5d4ba8958..7cf40aa4ab8 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: vnd.c,v 1.227 2013/12/29 08:09:44 pgoyette Exp $ */ +/* $NetBSD: vnd.c,v 1.228 2014/03/16 05:20:26 dholland Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.227 2013/12/29 08:09:44 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.228 2014/03/16 05:20:26 dholland Exp $"); #if defined(_KERNEL_OPT) #include "opt_vnd.h" @@ -197,12 +197,27 @@ static dev_type_dump(vnddump); static dev_type_size(vndsize); const struct bdevsw vnd_bdevsw = { - vndopen, vndclose, vndstrategy, vndioctl, vnddump, vndsize, D_DISK + .d_open = vndopen, + .d_close = vndclose, + .d_strategy = vndstrategy, + .d_ioctl = vndioctl, + .d_dump = vnddump, + .d_psize = vndsize, + .d_flag = D_DISK }; const struct cdevsw vnd_cdevsw = { - vndopen, vndclose, vndread, vndwrite, vndioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_DISK + .d_open = vndopen, + .d_close = vndclose, + .d_read = vndread, + .d_write = vndwrite, + .d_ioctl = vndioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_DISK }; static int vnd_match(device_t, cfdata_t, void *); diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index baa8457d643..83f7f81b19f 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay.c,v 1.136 2014/01/21 00:08:27 mlelstv Exp $ */ +/* $NetBSD: wsdisplay.c,v 1.137 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.136 2014/01/21 00:08:27 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.137 2014/03/16 05:20:29 dholland Exp $"); #include "opt_wsdisplay_compat.h" #include "opt_wsmsgattrs.h" @@ -189,9 +189,17 @@ dev_type_mmap(wsdisplaymmap); dev_type_kqfilter(wsdisplaykqfilter); const struct cdevsw wsdisplay_cdevsw = { - wsdisplayopen, wsdisplayclose, wsdisplayread, wsdisplaywrite, - wsdisplayioctl, wsdisplaystop, wsdisplaytty, wsdisplaypoll, - wsdisplaymmap, wsdisplaykqfilter, D_TTY + .d_open = wsdisplayopen, + .d_close = wsdisplayclose, + .d_read = wsdisplayread, + .d_write = wsdisplaywrite, + .d_ioctl = wsdisplayioctl, + .d_stop = wsdisplaystop, + .d_tty = wsdisplaytty, + .d_poll = wsdisplaypoll, + .d_mmap = wsdisplaymmap, + .d_kqfilter = wsdisplaykqfilter, + .d_flag = D_TTY }; static void wsdisplaystart(struct tty *); diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index b73fa32b2c3..3df0425c12a 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wskbd.c,v 1.132 2012/08/29 02:38:31 macallan Exp $ */ +/* $NetBSD: wskbd.c,v 1.133 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -105,7 +105,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.132 2012/08/29 02:38:31 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.133 2014/03/16 05:20:29 dholland Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -297,8 +297,17 @@ dev_type_poll(wskbdpoll); dev_type_kqfilter(wskbdkqfilter); const struct cdevsw wskbd_cdevsw = { - wskbdopen, wskbdclose, wskbdread, nowrite, wskbdioctl, - nostop, notty, wskbdpoll, nommap, wskbdkqfilter, D_OTHER + .d_open = wskbdopen, + .d_close = wskbdclose, + .d_read = wskbdread, + .d_write = nowrite, + .d_ioctl = wskbdioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = wskbdpoll, + .d_mmap = nommap, + .d_kqfilter = wskbdkqfilter, + .d_flag = D_OTHER }; #ifndef WSKBD_DEFAULT_BELL_PITCH diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index 9017a8d7bad..f9072ee8be2 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsmouse.c,v 1.64 2011/09/11 22:28:21 jakllsch Exp $ */ +/* $NetBSD: wsmouse.c,v 1.65 2014/03/16 05:20:29 dholland Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -104,7 +104,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.64 2011/09/11 22:28:21 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.65 2014/03/16 05:20:29 dholland Exp $"); #include "wsmouse.h" #include "wsdisplay.h" @@ -203,8 +203,17 @@ dev_type_poll(wsmousepoll); dev_type_kqfilter(wsmousekqfilter); const struct cdevsw wsmouse_cdevsw = { - wsmouseopen, wsmouseclose, wsmouseread, nowrite, wsmouseioctl, - nostop, notty, wsmousepoll, nommap, wsmousekqfilter, D_OTHER + .d_open = wsmouseopen, + .d_close = wsmouseclose, + .d_read = wsmouseread, + .d_write = nowrite, + .d_ioctl = wsmouseioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = wsmousepoll, + .d_mmap = nommap, + .d_kqfilter = wsmousekqfilter, + .d_flag = D_OTHER }; #if NWSMUX > 0 diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c index 5b4578bd27e..8a2230d44e3 100644 --- a/sys/dev/wscons/wsmux.c +++ b/sys/dev/wscons/wsmux.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsmux.c,v 1.56 2013/11/23 20:56:41 christos Exp $ */ +/* $NetBSD: wsmux.c,v 1.57 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.56 2013/11/23 20:56:41 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.57 2014/03/16 05:20:29 dholland Exp $"); #include "opt_compat_netbsd.h" #include "opt_modular.h" @@ -124,8 +124,17 @@ dev_type_poll(wsmuxpoll); dev_type_kqfilter(wsmuxkqfilter); const struct cdevsw wsmux_cdevsw = { - wsmuxopen, wsmuxclose, wsmuxread, nowrite, wsmuxioctl, - nostop, notty, wsmuxpoll, nommap, wsmuxkqfilter, D_OTHER + .d_open = wsmuxopen, + .d_close = wsmuxclose, + .d_read = wsmuxread, + .d_write = nowrite, + .d_ioctl = wsmuxioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = wsmuxpoll, + .d_mmap = nommap, + .d_kqfilter = wsmuxkqfilter, + .d_flag = D_OTHER }; struct wssrcops wsmux_srcops = { diff --git a/sys/dev/wsfont/wsfontdev.c b/sys/dev/wsfont/wsfontdev.c index 789559b321c..fce4d82e4e5 100644 --- a/sys/dev/wsfont/wsfontdev.c +++ b/sys/dev/wsfont/wsfontdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsfontdev.c,v 1.14 2007/03/04 06:02:52 christos Exp $ */ +/* $NetBSD: wsfontdev.c,v 1.15 2014/03/16 05:20:29 dholland Exp $ */ /* * Copyright (c) 2001 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.14 2007/03/04 06:02:52 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.15 2014/03/16 05:20:29 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -107,6 +107,15 @@ wsfontioctl(dev_t dev, u_long cmd, void *data, int flag, } const struct cdevsw wsfont_cdevsw = { - wsfontopen, wsfontclose, noread, nowrite, wsfontioctl, - nostop, notty, nopoll, nommap, nokqfilter, D_OTHER, + .d_open = wsfontopen, + .d_close = wsfontclose, + .d_read = noread, + .d_write = nowrite, + .d_ioctl = wsfontioctl, + .d_stop = nostop, + .d_tty = notty, + .d_poll = nopoll, + .d_mmap = nommap, + .d_kqfilter = nokqfilter, + .d_flag = D_OTHER }; |
