diff options
| author | phk <phk@FreeBSD.org> | 1999-09-25 16:21:39 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-09-25 16:21:39 +0000 |
| commit | a2c68c62dba7acc1de5dd6a6141484d9c12844fe (patch) | |
| tree | c55829a482e5222c5ae63cf589d4fd2a7ec13aec /sys/i386/isa/pcvt | |
| parent | 869afb6bbe2f0a063d91bf2099b7121d2d03c1b2 (diff) | |
| download | FreeBSD-src-a2c68c62dba7acc1de5dd6a6141484d9c12844fe.zip FreeBSD-src-a2c68c62dba7acc1de5dd6a6141484d9c12844fe.tar.gz | |
This patch clears the way for removing a number of tty related
fields in struct cdevsw:
d_stop moved to struct tty.
d_reset already unused.
d_devtotty linkage now provided by dev_t->si_tty.
These fields will be removed from struct cdevsw together with
d_params and d_maxio Real Soon Now.
The changes in this patch consist of:
initialize dev->si_tty in *_open()
initialize tty->t_stop
remove devtotty functions
rename ttpoll to ttypoll
a few adjustments to these changes in the generic code
a bump of __FreeBSD_version
add a couple of FreeBSD tags
Diffstat (limited to 'sys/i386/isa/pcvt')
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_drv.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index 4f0bfd6..8e5c26d 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -43,6 +43,8 @@ * * @(#)pcvt_drv.c, 3.20, Last Edit-Date: [Mon Apr 19 17:10:09 1999] * + * $FreeBSD$ + * */ /*---------------------------------------------------------------------------* @@ -121,7 +123,6 @@ static d_close_t pcclose; static d_read_t pcread; static d_write_t pcwrite; static d_ioctl_t pcioctl; -static d_devtotty_t pcdevtotty; static d_mmap_t pcmmap; #define CDEV_MAJOR 12 @@ -133,8 +134,8 @@ static struct cdevsw pc_cdevsw = { /* ioctl */ pcioctl, /* stop */ nostop, /* reset */ noreset, - /* devtotty */ pcdevtotty, - /* poll */ ttpoll, + /* devtotty */ nodevtotty, + /* poll */ ttypoll, /* mmap */ pcmmap, /* strategy */ nostrategy, /* name */ "vt", @@ -147,15 +148,6 @@ static struct cdevsw pc_cdevsw = { /* bmaj */ -1 }; -#if PCVT_FREEBSD > 205 -struct tty * -pcdevtotty(Dev_t dev) -{ - return get_pccons(dev); -} - -#endif /* PCVT_FREEBSD > 205 */ - #if PCVT_NETBSD > 100 /* NetBSD-current Feb 20 1995 */ int pcprobe(struct device *parent, void *match, void *aux) @@ -470,6 +462,8 @@ pcopen(Dev_t dev, int flag, int mode, struct proc *p) if((tp = get_pccons(dev)) == NULL) return ENXIO; + dev->si_tty = tp; + #if PCVT_EMU_MOUSE if(i == totalscreens) { |
