summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev
diff options
context:
space:
mode:
authordholland <dholland@NetBSD.org>2014-03-16 05:20:22 +0000
committerdholland <dholland@NetBSD.org>2014-03-16 05:20:22 +0000
commit76258fa0fe68b72536361d37e7b733d8bb10b786 (patch)
treee8334d8baca3ac8a5d20fc7647d104a782381607 /sys/arch/atari/dev
parent1ccd73de606f245b810e292b6739d955a4f27d56 (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/arch/atari/dev')
-rw-r--r--sys/arch/atari/dev/clock.c17
-rw-r--r--sys/arch/atari/dev/fd.c25
-rw-r--r--sys/arch/atari/dev/grf.c17
-rw-r--r--sys/arch/atari/dev/hdfd.c25
-rw-r--r--sys/arch/atari/dev/ite.c17
-rw-r--r--sys/arch/atari/dev/kbd.c17
-rw-r--r--sys/arch/atari/dev/lpt.c17
-rw-r--r--sys/arch/atari/dev/ms.c17
-rw-r--r--sys/arch/atari/dev/ser.c17
-rw-r--r--sys/arch/atari/dev/view.c17
-rw-r--r--sys/arch/atari/dev/zs.c17
11 files changed, 157 insertions, 46 deletions
diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c
index 0ce0ec640e5..d84887ac10c 100644
--- a/sys/arch/atari/dev/clock.c
+++ b/sys/arch/atari/dev/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.55 2013/01/26 18:13:55 apb Exp $ */
+/* $NetBSD: clock.c,v 1.56 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.55 2013/01/26 18:13:55 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.56 2014/03/16 05:20:23 dholland Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -122,8 +122,17 @@ CFATTACH_DECL_NEW(clock, sizeof(struct clock_softc),
clockmatch, clockattach, NULL, NULL);
const struct cdevsw rtc_cdevsw = {
- rtcopen, rtcclose, rtcread, rtcwrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter,
+ .d_open = rtcopen,
+ .d_close = rtcclose,
+ .d_read = rtcread,
+ .d_write = rtcwrite,
+ .d_ioctl = noioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_flag = 0
};
void statintr(struct clockframe);
diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c
index dba56bfb907..032da48f9bc 100644
--- a/sys/arch/atari/dev/fd.c
+++ b/sys/arch/atari/dev/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.76 2010/04/13 11:31:11 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.77 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.76 2010/04/13 11:31:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.77 2014/03/16 05:20:23 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -280,12 +280,27 @@ CFATTACH_DECL_NEW(fdc, 0,
fdcmatch, fdcattach, NULL, NULL);
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
};
static int
diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c
index 059fb3b6c4d..273c937df55 100644
--- a/sys/arch/atari/dev/grf.c
+++ b/sys/arch/atari/dev/grf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.47 2011/06/30 20:09:21 wiz Exp $ */
+/* $NetBSD: grf.c,v 1.48 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.47 2011/06/30 20:09:21 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.48 2014/03/16 05:20:23 dholland Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -108,8 +108,17 @@ dev_type_ioctl(grfioctl);
dev_type_mmap(grfmmap);
const struct cdevsw grf_cdevsw = {
- grfopen, grfclose, noread, nowrite, grfioctl,
- nostop, notty, nopoll, grfmmap, nokqfilter,
+ .d_open = grfopen,
+ .d_close = grfclose,
+ .d_read = noread,
+ .d_write = nowrite,
+ .d_ioctl = grfioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = grfmmap,
+ .d_kqfilter = nokqfilter,
+ .d_flag = 0
};
/*
diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c
index 8aa771f02bd..1ddfd860e52 100644
--- a/sys/arch/atari/dev/hdfd.c
+++ b/sys/arch/atari/dev/hdfd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.75 2011/07/01 20:34:05 dyoung Exp $ */
+/* $NetBSD: hdfd.c,v 1.76 2014/03/16 05:20:23 dholland Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.75 2011/07/01 20:34:05 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.76 2014/03/16 05:20:23 dholland Exp $");
#include "opt_ddb.h"
@@ -286,12 +286,27 @@ CFATTACH_DECL_NEW(hdfd, sizeof(struct fd_softc),
fdprobe, fdattach, NULL, NULL);
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 fdstart(struct fd_softc *);
diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c
index 82203fc5525..f8a58067c00 100644
--- a/sys/arch/atari/dev/ite.c
+++ b/sys/arch/atari/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.72 2014/02/19 11:40:31 tsutsui Exp $ */
+/* $NetBSD: ite.c,v 1.73 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.72 2014/02/19 11:40:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.73 2014/03/16 05:20:23 dholland Exp $");
#include "opt_ddb.h"
@@ -160,8 +160,17 @@ dev_type_tty(itetty);
dev_type_poll(itepoll);
const struct cdevsw ite_cdevsw = {
- iteopen, iteclose, iteread, itewrite, iteioctl,
- nostop, itetty, itepoll, nommap, ttykqfilter, D_TTY
+ .d_open = iteopen,
+ .d_close = iteclose,
+ .d_read = iteread,
+ .d_write = itewrite,
+ .d_ioctl = iteioctl,
+ .d_stop = nostop,
+ .d_tty = itetty,
+ .d_poll = itepoll,
+ .d_mmap = nommap,
+ .d_kqfilter = ttykqfilter,
+ .d_flag = D_TTY
};
/*
diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c
index 55224e0cec1..ab1484e0a73 100644
--- a/sys/arch/atari/dev/kbd.c
+++ b/sys/arch/atari/dev/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.42 2011/06/05 06:31:41 tsutsui Exp $ */
+/* $NetBSD: kbd.c,v 1.43 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.42 2011/06/05 06:31:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.43 2014/03/16 05:20:23 dholland Exp $");
#include "mouse.h"
#include "ite.h"
@@ -129,8 +129,17 @@ CFATTACH_DECL_NEW(kbd, 0,
kbdmatch, kbdattach, NULL, NULL);
const struct cdevsw kbd_cdevsw = {
- kbdopen, kbdclose, kbdread, nowrite, kbdioctl,
- nostop, notty, kbdpoll, nommap, kbdkqfilter,
+ .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 = 0
};
#if NWSKBD>0
diff --git a/sys/arch/atari/dev/lpt.c b/sys/arch/atari/dev/lpt.c
index 1d25351b3ad..72bb260021d 100644
--- a/sys/arch/atari/dev/lpt.c
+++ b/sys/arch/atari/dev/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.35 2012/10/27 17:17:42 chs Exp $ */
+/* $NetBSD: lpt.c,v 1.36 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.35 2012/10/27 17:17:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.36 2014/03/16 05:20:23 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,8 +136,17 @@ CFATTACH_DECL_NEW(lp, sizeof(struct lpt_softc),
lpmatch, lpattach, NULL, NULL);
const struct cdevsw lp_cdevsw = {
- lpopen, lpclose, noread, lpwrite, lpioctl,
- nostop, notty, nopoll, nommap, nokqfilter,
+ .d_open = lpopen,
+ .d_close = lpclose,
+ .d_read = noread,
+ .d_write = lpwrite,
+ .d_ioctl = lpioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_flag = 0
};
/*ARGSUSED*/
diff --git a/sys/arch/atari/dev/ms.c b/sys/arch/atari/dev/ms.c
index fdd2e1c7039..fdb16d79925 100644
--- a/sys/arch/atari/dev/ms.c
+++ b/sys/arch/atari/dev/ms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.24 2009/03/14 21:04:06 dsl Exp $ */
+/* $NetBSD: ms.c,v 1.25 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.24 2009/03/14 21:04:06 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.25 2014/03/16 05:20:23 dholland Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -91,8 +91,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_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 = 0
};
static void ms_3b_delay(struct ms_softc *);
diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c
index afcd33709a7..b68540a895a 100644
--- a/sys/arch/atari/dev/ser.c
+++ b/sys/arch/atari/dev/ser.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.52 2011/04/24 16:26:55 rmind Exp $ */
+/* $NetBSD: ser.c,v 1.53 2014/03/16 05:20:23 dholland Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.52 2011/04/24 16:26:55 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.53 2014/03/16 05:20:23 dholland Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -259,8 +259,17 @@ dev_type_tty(sertty);
dev_type_poll(serpoll);
const struct cdevsw ser_cdevsw = {
- seropen, serclose, serread, serwrite, serioctl,
- serstop, sertty, serpoll, nommap, ttykqfilter, D_TTY
+ .d_open = seropen,
+ .d_close = serclose,
+ .d_read = serread,
+ .d_write = serwrite,
+ .d_ioctl = serioctl,
+ .d_stop = serstop,
+ .d_tty = sertty,
+ .d_poll = serpoll,
+ .d_mmap = nommap,
+ .d_kqfilter = ttykqfilter,
+ .d_flag = D_TTY
};
#ifndef SERCONSOLE
diff --git a/sys/arch/atari/dev/view.c b/sys/arch/atari/dev/view.c
index c3d42cdc9e7..65cec47bb5b 100644
--- a/sys/arch/atari/dev/view.c
+++ b/sys/arch/atari/dev/view.c
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.32 2010/04/13 11:31:11 tsutsui Exp $ */
+/* $NetBSD: view.c,v 1.33 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
* a interface to graphics. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.32 2010/04/13 11:31:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.33 2014/03/16 05:20:23 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,8 +76,17 @@ dev_type_ioctl(viewioctl);
dev_type_mmap(viewmmap);
const struct cdevsw view_cdevsw = {
- viewopen, viewclose, nullread, nullwrite, viewioctl,
- nostop, notty, nopoll, viewmmap, nokqfilter,
+ .d_open = viewopen,
+ .d_close = viewclose,
+ .d_read = nullread,
+ .d_write = nullwrite,
+ .d_ioctl = viewioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = viewmmap,
+ .d_kqfilter = nokqfilter,
+ .d_flag = 0
};
/*
diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c
index acee5896000..9dea9e191ba 100644
--- a/sys/arch/atari/dev/zs.c
+++ b/sys/arch/atari/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.74 2011/06/30 20:09:21 wiz Exp $ */
+/* $NetBSD: zs.c,v 1.75 2014/03/16 05:20:23 dholland Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.74 2011/06/30 20:09:21 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.75 2014/03/16 05:20:23 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,8 +238,17 @@ dev_type_tty(zstty);
dev_type_poll(zspoll);
const struct cdevsw zs_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
};
/* Interrupt handlers. */