diff options
author | phk <phk@FreeBSD.org> | 1999-05-30 16:53:49 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-05-30 16:53:49 +0000 |
commit | 7e4a9dced9acd97789b37c32063ee7a8aa133f6d (patch) | |
tree | 407469b3581129f6442306683b28d6b54126baad /sys/alpha | |
parent | dfa3967ffa4d84ed0b1691fac89ba3e73b8544e0 (diff) | |
download | FreeBSD-src-7e4a9dced9acd97789b37c32063ee7a8aa133f6d.zip FreeBSD-src-7e4a9dced9acd97789b37c32063ee7a8aa133f6d.tar.gz |
This commit should be a extensive NO-OP:
Reformat and initialize correctly all "struct cdevsw".
Initialize the d_maj and d_bmaj fields.
The d_reset field was not removed, although it is never used.
I used a program to do most of this, so all the files now use the
same consistent format. Please keep it that way.
Vinum and i4b not modified, patches emailed to respective authors.
Diffstat (limited to 'sys/alpha')
-rw-r--r-- | sys/alpha/alpha/cons.c | 27 | ||||
-rw-r--r-- | sys/alpha/alpha/mem.c | 27 | ||||
-rw-r--r-- | sys/alpha/alpha/promcons.c | 25 | ||||
-rw-r--r-- | sys/alpha/tlsb/zs_tlsb.c | 25 |
4 files changed, 84 insertions, 20 deletions
diff --git a/sys/alpha/alpha/cons.c b/sys/alpha/alpha/cons.c index 3af7783..1cb7ac2 100644 --- a/sys/alpha/alpha/cons.c +++ b/sys/alpha/alpha/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.6 1999/05/08 06:37:51 phk Exp $ + * $Id: cons.c,v 1.7 1999/05/15 18:14:03 dfr Exp $ */ #include "opt_devfs.h" @@ -84,10 +84,27 @@ static d_ioctl_t cnioctl; static d_poll_t cnpoll; #define CDEV_MAJOR 0 -static struct cdevsw cn_cdevsw = - { cnopen, cnclose, cnread, cnwrite, /*0*/ - cnioctl, nullstop, nullreset, nodevtotty,/* console */ - cnpoll, nommap, NULL, "console", NULL, -1 }; +static struct cdevsw cn_cdevsw = { + /* open */ cnopen, + /* close */ cnclose, + /* read */ cnread, + /* write */ cnwrite, + /* ioctl */ cnioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ cnpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "console", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; static dev_t cn_dev_t; /* seems to be never really used */ static udev_t cn_udev_t; diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c index 4590752..c266810 100644 --- a/sys/alpha/alpha/mem.c +++ b/sys/alpha/alpha/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.7 1999/05/25 19:32:53 dt Exp $ + * $Id: mem.c,v 1.8 1999/05/29 19:47:51 gallatin Exp $ */ /* @@ -82,10 +82,27 @@ static d_mmap_t memmmap; static d_poll_t mmpoll; #define CDEV_MAJOR 2 -static struct cdevsw mem_cdevsw = - { mmopen, mmclose, mmrw, mmrw, /*2*/ - mmioctl, nullstop, nullreset, nodevtotty,/* memory */ - mmpoll, memmmap, NULL, "mem", NULL, -1 }; +static struct cdevsw mem_cdevsw = { + /* open */ mmopen, + /* close */ mmclose, + /* read */ mmrw, + /* write */ mmrw, + /* ioctl */ mmioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ mmpoll, + /* mmap */ memmmap, + /* strategy */ nostrategy, + /* name */ "mem", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; #ifdef DEVFS static void *mem_devfs_token; diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c index 5570c7e..f3dbde8 100644 --- a/sys/alpha/alpha/promcons.c +++ b/sys/alpha/alpha/promcons.c @@ -1,4 +1,4 @@ -/* $Id: promcons.c,v 1.6 1999/05/07 10:09:28 phk Exp $ */ +/* $Id: promcons.c,v 1.7 1999/05/09 08:57:47 phk Exp $ */ /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */ /* @@ -69,10 +69,25 @@ static d_devtotty_t promdevtotty; #define CDEV_MAJOR 97 static struct cdevsw prom_cdevsw = { - promopen, promclose, promread, promwrite, - promioctl, promstop, noreset, promdevtotty, - ttpoll, nommap, NULL, "prom", - NULL, -1, + /* open */ promopen, + /* close */ promclose, + /* read */ promread, + /* write */ promwrite, + /* ioctl */ promioctl, + /* stop */ promstop, + /* reset */ noreset, + /* devtotty */ promdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "prom", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; static struct tty prom_tty[1]; diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c index 0c1d97e..10a5a49 100644 --- a/sys/alpha/tlsb/zs_tlsb.c +++ b/sys/alpha/tlsb/zs_tlsb.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: zs_tlsb.c,v 1.11 1999/05/09 13:00:30 phk Exp $ + * $Id: zs_tlsb.c,v 1.12 1999/05/10 14:01:35 dfr Exp $ */ /* * This driver is a hopeless hack to get the SimOS console working. A real @@ -72,10 +72,25 @@ static d_devtotty_t zsdevtotty; #define CDEV_MAJOR 98 static struct cdevsw zs_cdevsw = { - zsopen, zsclose, zsread, zswrite, - zsioctl, zsstop, noreset, zsdevtotty, - ttpoll, nommap, NULL, "zs", - NULL, -1, + /* open */ zsopen, + /* close */ zsclose, + /* read */ zsread, + /* write */ zswrite, + /* ioctl */ zsioctl, + /* stop */ zsstop, + /* reset */ noreset, + /* devtotty */ zsdevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "zs", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; static void zsstart __P((struct tty *)); |