diff options
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 31 | ||||
| -rw-r--r-- | sys/isa/joy.c | 25 | ||||
| -rw-r--r-- | sys/isa/psm.c | 26 | ||||
| -rw-r--r-- | sys/isa/sio.c | 28 | ||||
| -rw-r--r-- | sys/isa/vga_isa.c | 27 |
5 files changed, 107 insertions, 30 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index cc51f93..cd7001b 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.143 1999/05/11 04:58:30 bde Exp $ + * $Id: fd.c,v 1.144 1999/05/30 11:10:54 dfr Exp $ * */ @@ -370,16 +370,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/isa/joy.c b/sys/isa/joy.c index 5d4a7c2..6847f43 100644 --- a/sys/isa/joy.c +++ b/sys/isa/joy.c @@ -92,10 +92,27 @@ static d_close_t joyclose; static d_read_t joyread; static d_ioctl_t joyioctl; -static struct cdevsw joy_cdevsw = - { joyopen, joyclose, joyread, nowrite, /*51*/ - joyioctl, nostop, nullreset, nodevtotty,/*joystick */ - seltrue, nommap, NULL, "joy", NULL, -1 }; +static struct cdevsw joy_cdevsw = { + /* open */ joyopen, + /* close */ joyclose, + /* read */ joyread, + /* write */ nowrite, + /* ioctl */ joyioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "joy", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 +}; static int get_tick __P((void)); diff --git a/sys/isa/psm.c b/sys/isa/psm.c index a520b65..1d1589c 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.8 1999/05/09 04:58:35 yokota Exp $ + * $Id: psm.c,v 1.9 1999/05/09 13:00:43 phk Exp $ */ /* @@ -315,10 +315,26 @@ static driver_t psm_driver = { #define CDEV_MAJOR 21 -static struct cdevsw psm_cdevsw = { - psmopen, psmclose, psmread, nowrite, /* 21 */ - psmioctl, nostop, nullreset, nodevtotty, - psmpoll, nommap, NULL, "psm", NULL, -1 +static struct cdevsw psm_cdevsw = { + /* open */ psmopen, + /* close */ psmclose, + /* read */ psmread, + /* write */ nowrite, + /* ioctl */ psmioctl, + /* stop */ nostop, + /* reset */ noreset, + /* devtotty */ nodevtotty, + /* poll */ psmpoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "psm", + /* parms */ noparms, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ 0, + /* maxio */ 0, + /* bmaj */ -1 }; /* debug message level */ diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 4439ed2..c0a33cd 100644 --- a/sys/isa/sio.c +++ b/sys/isa/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.243 1999/05/28 09:37:11 dfr Exp $ + * $Id: sio.c,v 1.244 1999/05/30 11:14:39 dfr Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -361,12 +361,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/isa/vga_isa.c b/sys/isa/vga_isa.c index d95bce7..07bffa8 100644 --- a/sys/isa/vga_isa.c +++ b/sys/isa/vga_isa.c @@ -26,7 +26,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: vga_isa.c,v 1.8 1999/05/09 16:39:24 peter Exp $ + * $Id: vga_isa.c,v 1.9 1999/05/30 11:12:30 dfr Exp $ */ #include "vga.h" @@ -100,11 +100,26 @@ static d_close_t isavgaclose; static d_read_t isavgaread; static d_ioctl_t isavgaioctl; -static struct cdevsw vga_cdevsw = { - isavgaopen, isavgaclose, noread, nowrite, /* ?? */ - isavgaioctl, nostop, nullreset, nodevtotty, - seltrue, nommap, NULL, DRIVER_NAME, - NULL, -1, nodump, nopsize, +static struct cdevsw vga_cdevsw = { + /* open */ isavgaopen, + /* close */ isavgaclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ isavgaioctl, + /* 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 */ |
