summaryrefslogtreecommitdiff
path: root/sys/pc98/cbus
diff options
context:
space:
mode:
Diffstat (limited to 'sys/pc98/cbus')
-rw-r--r--sys/pc98/cbus/fdc.c22
-rw-r--r--sys/pc98/cbus/gdc.c21
-rw-r--r--sys/pc98/cbus/olpt.c19
-rw-r--r--sys/pc98/cbus/sio.c24
4 files changed, 33 insertions, 53 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 98b96229a7ae1..05d6ab9cbf0e8 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -620,19 +620,15 @@ fdin_rd(fdc_p fdc)
#define CDEV_MAJOR 9
static struct cdevsw fd_cdevsw = {
- /* open */ Fdopen,
- /* close */ fdclose,
- /* read */ physread,
- /* write */ physwrite,
- /* ioctl */ fdioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ fdstrategy,
- /* name */ "fd",
- /* maj */ CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ D_DISK,
+ .d_open = Fdopen,
+ .d_close = fdclose,
+ .d_read = physread,
+ .d_write = physwrite,
+ .d_ioctl = fdioctl,
+ .d_strategy = fdstrategy,
+ .d_name = "fd",
+ .d_maj = CDEV_MAJOR,
+ .d_flags = D_DISK,
};
/*
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index 6525c5b2e7f62..01a63ad58ae83 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -102,19 +102,14 @@ static d_ioctl_t gdcioctl;
static d_mmap_t gdcmmap;
static struct cdevsw gdc_cdevsw = {
- /* open */ gdcopen,
- /* close */ gdcclose,
- /* read */ gdcread,
- /* write */ gdcwrite,
- /* ioctl */ gdcioctl,
- /* poll */ nopoll,
- /* mmap */ gdcmmap,
- /* strategy */ nostrategy,
- /* name */ DRIVER_NAME,
- /* maj */ -1,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = gdcopen,
+ .d_close = gdcclose,
+ .d_read = gdcread,
+ .d_write = gdcwrite,
+ .d_ioctl = gdcioctl,
+ .d_mmap = gdcmmap,
+ .d_name = DRIVER_NAME,
+ .d_maj = -1,
};
#endif /* FB_INSTALL_CDEV */
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 6e41a420ec53b..e54b1433e0747 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -232,19 +232,12 @@ static d_ioctl_t lptioctl;
#define CDEV_MAJOR 16
static struct cdevsw lpt_cdevsw = {
- /* open */ lptopen,
- /* close */ lptclose,
- /* read */ noread,
- /* write */ lptwrite,
- /* ioctl */ lptioctl,
- /* poll */ nopoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ "lpt",
- /* maj */ CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ 0,
+ .d_open = lptopen,
+ .d_close = lptclose,
+ .d_write = lptwrite,
+ .d_ioctl = lptioctl,
+ .d_name = "lpt",
+ .d_maj = CDEV_MAJOR,
};
static bus_addr_t lpt_iat[] = {0, 2, 4, 6};
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 18f14831d74bb..3ec2bee6010b6 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -407,20 +407,16 @@ static d_ioctl_t sioioctl;
#define CDEV_MAJOR 28
static struct cdevsw sio_cdevsw = {
- /* open */ sioopen,
- /* close */ sioclose,
- /* read */ sioread,
- /* write */ siowrite,
- /* ioctl */ sioioctl,
- /* poll */ ttypoll,
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ sio_driver_name,
- /* maj */ CDEV_MAJOR,
- /* dump */ nodump,
- /* psize */ nopsize,
- /* flags */ D_TTY | D_KQFILTER,
- /* kqfilter */ ttykqfilter,
+ .d_open = sioopen,
+ .d_close = sioclose,
+ .d_read = sioread,
+ .d_write = siowrite,
+ .d_ioctl = sioioctl,
+ .d_poll = ttypoll,
+ .d_name = sio_driver_name,
+ .d_maj = CDEV_MAJOR,
+ .d_flags = D_TTY | D_KQFILTER,
+ .d_kqfilter = ttykqfilter,
};
int comconsole = -1;