diff options
Diffstat (limited to 'sys/pc98')
-rw-r--r-- | sys/pc98/cbus/fdc.c | 31 | ||||
-rw-r--r-- | sys/pc98/cbus/gdc.c | 27 | ||||
-rw-r--r-- | sys/pc98/cbus/pckbd.c | 27 | ||||
-rw-r--r-- | sys/pc98/cbus/sio.c | 28 | ||||
-rw-r--r-- | sys/pc98/pc98/fd.c | 31 | ||||
-rw-r--r-- | sys/pc98/pc98/lpt.c | 27 | ||||
-rw-r--r-- | sys/pc98/pc98/mse.c | 27 | ||||
-rw-r--r-- | sys/pc98/pc98/pc98gdc.c | 27 | ||||
-rw-r--r-- | sys/pc98/pc98/pc98kbd.c | 27 | ||||
-rw-r--r-- | sys/pc98/pc98/pcaudio.c | 27 | ||||
-rw-r--r-- | sys/pc98/pc98/sio.c | 28 | ||||
-rw-r--r-- | sys/pc98/pc98/spkr.c | 27 | ||||
-rw-r--r-- | sys/pc98/pc98/syscons.c | 28 | ||||
-rw-r--r-- | sys/pc98/pc98/wd.c | 29 | ||||
-rw-r--r-- | sys/pc98/pc98/wd_cd.c | 26 | ||||
-rw-r--r-- | sys/pc98/pc98/wfd.c | 27 | ||||
-rw-r--r-- | sys/pc98/pc98/wst.c | 26 |
17 files changed, 364 insertions, 106 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index 2787b90..b08d689 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.60 1999/05/09 04:34:28 kato Exp $ + * $Id: fd.c,v 1.61 1999/05/11 08:37:16 kato Exp $ * */ @@ -466,16 +466,31 @@ static d_close_t fdclose; static d_ioctl_t fdioctl; static d_strategy_t fdstrategy; -static struct cdevsw fd_cdevsw = { - Fdopen, fdclose, physread, physwrite, - fdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, fdstrategy, "fd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 -}; #define CDEV_MAJOR 9 #define BDEV_MAJOR 2 +static struct cdevsw fd_cdevsw = { + /* open */ Fdopen, + /* close */ fdclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ fdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ fdstrategy, + /* name */ "fd", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_DISK, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR +}; + static int fdc_err(struct fdc_data *fdc, const char *s) { diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index 3226900..a6efd2a 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pc98gdc.c,v 1.7 1999/04/18 14:42:18 kato Exp $ + * $Id: pc98gdc.c,v 1.8 1999/05/09 04:56:42 kato Exp $ */ #include "gdc.h" @@ -101,11 +101,26 @@ static d_close_t gdcclose; static d_read_t gdcread; static d_ioctl_t gdcioctl; -static struct cdevsw vga_cdevsw = { - gdcopen, gdcclose, noread, nowrite, /* ?? */ - gdcioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, NULL, DRIVER_NAME, - NULL, -1, nodump, nopsize, +static struct cdevsw vga_cdevsw = { + /* open */ gdcopen, + /* close */ gdcclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ gdcioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* FB_INSTALL_CDEV */ diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c index 38e0bc0..dff8162 100644 --- a/sys/pc98/cbus/pckbd.c +++ b/sys/pc98/cbus/pckbd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pc98kbd.c,v 1.6 1999/04/18 14:42:18 kato Exp $ + * $Id: pc98kbd.c,v 1.7 1999/05/09 04:53:58 kato Exp $ */ #include "pckbd.h" @@ -119,11 +119,26 @@ static d_read_t pckbdread; static d_ioctl_t pckbdioctl; static d_poll_t pckbdpoll; -static struct cdevsw pckbd_cdevsw = { - pckbdopen, pckbdclose, pckbdread, nowrite, - pckbdioctl, nostop, nullreset, nodevtotty, - pckbdpoll, nommap, NULL, DRIVER_NAME, - NULL, -1, +static struct cdevsw pckbd_cdevsw = { + /* open */ pckbdopen, + /* close */ pckbdclose, + /* read */ pckbdread, + /* write */ nowrite, + /* ioctl */ pckbdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ pckbdpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* KBD_INSTALL_CDEV */ diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index b71775b..c09af65 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.95 1999/05/10 09:37:37 kato Exp $ + * $Id: sio.c,v 1.96 1999/05/11 08:38:28 kato Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -481,12 +481,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; int comconsole = -1; diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index 2787b90..b08d689 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.60 1999/05/09 04:34:28 kato Exp $ + * $Id: fd.c,v 1.61 1999/05/11 08:37:16 kato Exp $ * */ @@ -466,16 +466,31 @@ static d_close_t fdclose; static d_ioctl_t fdioctl; static d_strategy_t fdstrategy; -static struct cdevsw fd_cdevsw = { - Fdopen, fdclose, physread, physwrite, - fdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, fdstrategy, "fd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 -}; #define CDEV_MAJOR 9 #define BDEV_MAJOR 2 +static struct cdevsw fd_cdevsw = { + /* open */ Fdopen, + /* close */ fdclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ fdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ fdstrategy, + /* name */ "fd", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_DISK, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR +}; + static int fdc_err(struct fdc_data *fdc, const char *s) { diff --git a/sys/pc98/pc98/lpt.c b/sys/pc98/pc98/lpt.c index a8c249c..51999ab 100644 --- a/sys/pc98/pc98/lpt.c +++ b/sys/pc98/pc98/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.25 1999/01/28 11:24:36 kato Exp $ + * $Id: lpt.c,v 1.26 1999/04/28 10:53:53 dt Exp $ */ /* @@ -308,10 +308,27 @@ static d_write_t lptwrite; static d_ioctl_t lptioctl; #define CDEV_MAJOR 16 -static struct cdevsw lpt_cdevsw = - { lptopen, lptclose, noread, lptwrite, /*16*/ - lptioctl, nullstop, nullreset, nodevtotty,/* lpt */ - seltrue, nommap, nostrat, "lpt", NULL, -1 }; +static struct cdevsw lpt_cdevsw = { + /* open */ lptopen, + /* close */ lptclose, + /* read */ noread, + /* write */ lptwrite, + /* ioctl */ lptioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "lpt", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; #ifndef PC98 /* diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c index 8d89a40..596b10c 100644 --- a/sys/pc98/pc98/mse.c +++ b/sys/pc98/pc98/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.19 1999/04/28 10:53:55 dt Exp $ + * $Id: mse.c,v 1.20 1999/05/09 04:37:17 kato Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -83,10 +83,27 @@ static d_ioctl_t mseioctl; static d_poll_t msepoll; #define CDEV_MAJOR 27 -static struct cdevsw mse_cdevsw = - { mseopen, mseclose, mseread, nowrite, /*27*/ - mseioctl, nostop, nullreset, nodevtotty,/* mse */ - msepoll, nommap, NULL, "mse", NULL, -1 }; +static struct cdevsw mse_cdevsw = { + /* open */ mseopen, + /* close */ mseclose, + /* read */ mseread, + /* write */ nowrite, + /* ioctl */ mseioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ msepoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "mse", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; static ointhand2_t mseintr; diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c index 3226900..a6efd2a 100644 --- a/sys/pc98/pc98/pc98gdc.c +++ b/sys/pc98/pc98/pc98gdc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pc98gdc.c,v 1.7 1999/04/18 14:42:18 kato Exp $ + * $Id: pc98gdc.c,v 1.8 1999/05/09 04:56:42 kato Exp $ */ #include "gdc.h" @@ -101,11 +101,26 @@ static d_close_t gdcclose; static d_read_t gdcread; static d_ioctl_t gdcioctl; -static struct cdevsw vga_cdevsw = { - gdcopen, gdcclose, noread, nowrite, /* ?? */ - gdcioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, NULL, DRIVER_NAME, - NULL, -1, nodump, nopsize, +static struct cdevsw vga_cdevsw = { + /* open */ gdcopen, + /* close */ gdcclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ gdcioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* FB_INSTALL_CDEV */ diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c index 38e0bc0..dff8162 100644 --- a/sys/pc98/pc98/pc98kbd.c +++ b/sys/pc98/pc98/pc98kbd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pc98kbd.c,v 1.6 1999/04/18 14:42:18 kato Exp $ + * $Id: pc98kbd.c,v 1.7 1999/05/09 04:53:58 kato Exp $ */ #include "pckbd.h" @@ -119,11 +119,26 @@ static d_read_t pckbdread; static d_ioctl_t pckbdioctl; static d_poll_t pckbdpoll; -static struct cdevsw pckbd_cdevsw = { - pckbdopen, pckbdclose, pckbdread, nowrite, - pckbdioctl, nostop, nullreset, nodevtotty, - pckbdpoll, nommap, NULL, DRIVER_NAME, - NULL, -1, +static struct cdevsw pckbd_cdevsw = { + /* open */ pckbdopen, + /* close */ pckbdclose, + /* read */ pckbdread, + /* write */ nowrite, + /* ioctl */ pckbdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ pckbdpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ DRIVER_NAME, + /* parms */ noparms, + /* maj */ -1, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; #endif /* KBD_INSTALL_CDEV */ diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c index 43caf09..ee06ce2 100644 --- a/sys/pc98/pc98/pcaudio.c +++ b/sys/pc98/pc98/pcaudio.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcaudio.c,v 1.21 1999/04/28 10:53:57 dt Exp $ + * $Id: pcaudio.c,v 1.22 1999/05/09 04:39:36 kato Exp $ */ #include "pca.h" @@ -145,10 +145,27 @@ static d_ioctl_t pcaioctl; static d_poll_t pcapoll; #define CDEV_MAJOR 24 -static struct cdevsw pca_cdevsw = - { pcaopen, pcaclose, noread, pcawrite, /*24*/ - pcaioctl, nostop, nullreset, nodevtotty,/* pcaudio */ - pcapoll, nommap, NULL, "pca", NULL, -1 }; +static struct cdevsw pca_cdevsw = { + /* open */ pcaopen, + /* close */ pcaclose, + /* read */ noread, + /* write */ pcawrite, + /* ioctl */ pcaioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ pcapoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "pca", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; static void pca_continue __P((void)); static void pca_init __P((void)); diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index b71775b..c09af65 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.95 1999/05/10 09:37:37 kato Exp $ + * $Id: sio.c,v 1.96 1999/05/11 08:38:28 kato Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -481,12 +481,26 @@ static d_stop_t siostop; static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 -static struct cdevsw sio_cdevsw = { - sioopen, sioclose, sioread, siowrite, - sioioctl, siostop, noreset, siodevtotty, - ttpoll, nommap, NULL, driver_name, - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sio_cdevsw = { + /* open */ sioopen, + /* close */ sioclose, + /* read */ sioread, + /* write */ siowrite, + /* ioctl */ sioioctl, + /* stop */ siostop, + /* reset */ noreset, + /* devtotty */ siodevtotty, + /* poll */ ttpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ driver_name, + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; int comconsole = -1; diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c index 4121a17..f106113 100644 --- a/sys/pc98/pc98/spkr.c +++ b/sys/pc98/pc98/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.13 1998/06/08 08:55:45 kato Exp $ + * $Id: spkr.c,v 1.14 1998/08/28 12:47:45 kato Exp $ */ /* @@ -43,10 +43,27 @@ static d_write_t spkrwrite; static d_ioctl_t spkrioctl; #define CDEV_MAJOR 26 -static struct cdevsw spkr_cdevsw = - { spkropen, spkrclose, noread, spkrwrite, /*26*/ - spkrioctl, nostop, nullreset, nodevtotty,/* spkr */ - seltrue, nommap, NULL, "spkr", NULL, -1 }; +static struct cdevsw spkr_cdevsw = { + /* open */ spkropen, + /* close */ spkrclose, + /* read */ noread, + /* write */ spkrwrite, + /* ioctl */ spkrioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "spkr", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; /**************** MACHINE DEPENDENT PART STARTS HERE ************************* * diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c index 459968d..fa8119a 100644 --- a/sys/pc98/pc98/syscons.c +++ b/sys/pc98/pc98/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.117 1999/04/27 11:18:04 phk Exp $ + * $Id: syscons.c,v 1.118 1999/05/09 05:02:26 kato Exp $ */ #include "sc.h" @@ -383,12 +383,26 @@ static d_ioctl_t scioctl; static d_mmap_t scmmap; #define CDEV_MAJOR 12 -static struct cdevsw sc_cdevsw = { - scopen, scclose, scread, scwrite, - scioctl, nullstop, noreset, scdevtotty, - ttpoll, scmmap, nostrategy, "sc", - NULL, -1, nodump, nopsize, - D_TTY, +static struct cdevsw sc_cdevsw = { + /* open */ scopen, + /* close */ scclose, + /* read */ scread, + /* write */ scwrite, + /* ioctl */ scioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ scdevtotty, + /* poll */ ttpoll, + /* mmap */ scmmap, + /* strategy */ nostrategy, + /* name */ "sc", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY, + /* maxio */ 0, + /* bmaj */ -1 }; #ifdef PC98 diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 5ea452d..ebecceb 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.81 1999/05/09 04:42:10 kato Exp $ + * $Id: wd.c,v 1.82 1999/05/25 10:41:14 kato Exp $ */ /* TODO: @@ -267,14 +267,27 @@ static d_psize_t wdsize; #define CDEV_MAJOR 3 #define BDEV_MAJOR 0 - static struct cdevsw wd_cdevsw = { - wdopen, wdclose, physread, physwrite, - wdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wdstrategy, "wd", - NULL, -1, wddump, wdsize, - D_DISK, 0, -1 }; - + /* open */ wdopen, + /* close */ wdclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ wdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ wdstrategy, + /* name */ "wd", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ wddump, + /* psize */ wdsize, + /* flags */ D_DISK, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR +}; static int atapictrlr; static int eide_quirks; diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c index 99333d4..644fb3f 100644 --- a/sys/pc98/pc98/wd_cd.c +++ b/sys/pc98/pc98/wd_cd.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-cd.c,v 1.17 1999/05/07 07:03:23 phk Exp $ + * $Id: atapi-cd.c,v 1.18 1999/05/11 10:39:27 sos Exp $ */ #include "wdc.h" @@ -61,11 +61,25 @@ static d_strategy_t acdstrategy; #define CDEV_MAJOR 69 #define BDEV_MAJOR 19 static struct cdevsw acd_cdevsw = { - acdopen, acdclose, physread, physwrite, - acdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, acdstrategy, "wcd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 + /* open */ acdopen, + /* close */ acdclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ acdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ acdstrategy, + /* name */ "wcd", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_DISK, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR }; #define NUNIT 16 /* Max # of devices */ diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c index 8aa5e11..d03a201 100644 --- a/sys/pc98/pc98/wfd.c +++ b/sys/pc98/pc98/wfd.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wfd.c,v 1.22 1999/04/28 10:53:04 dt Exp $ + * $Id: wfd.c,v 1.23 1999/05/07 07:03:31 phk Exp $ */ /* @@ -61,11 +61,26 @@ static d_strategy_t wfdstrategy; #define BDEV_MAJOR 1 static struct cdevsw wfd_cdevsw = { - wfdopen, wfdclose, physread, physwrite, - wfdioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wfdstrategy, "wfd", - NULL, -1, nodump, nopsize, - D_DISK, 0, -1 }; + /* open */ wfdopen, + /* close */ wfdclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ wfdioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ wfdstrategy, + /* name */ "wfd", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_DISK, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR +}; int wfdattach(struct atapi*, int, struct atapi_params*, int); diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c index 67af539..82832d4 100644 --- a/sys/pc98/pc98/wst.c +++ b/sys/pc98/pc98/wst.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: wst.c,v 1.20 1999/05/06 18:50:10 peter Exp $ + * $Id: wst.c,v 1.21 1999/05/07 07:03:32 phk Exp $ */ #include "wdc.h" @@ -59,10 +59,26 @@ static d_strategy_t wststrategy; static struct cdevsw wst_cdevsw = { - wstopen, wstclose, physread, physwrite, - wstioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, wststrategy, "wst", - NULL, -1 }; + /* open */ wstopen, + /* close */ wstclose, + /* read */ physread, + /* write */ physwrite, + /* ioctl */ wstioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ wststrategy, + /* name */ "wst", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ BDEV_MAJOR +}; static unsigned int wst_total = 0; |