summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-02-21 20:41:11 +0000
committerphk <phk@FreeBSD.org>2004-02-21 20:41:11 +0000
commitfcf7e634fb12f16e5d5a0b3ee3cfafda001a303c (patch)
treeb4c7c5f55a2681dc99feaf813fae3d32fabd502e /sys/i386/isa
parent32b7c9a433930842533064d829ba214aadf6a67d (diff)
downloadFreeBSD-src-fcf7e634fb12f16e5d5a0b3ee3cfafda001a303c.zip
FreeBSD-src-fcf7e634fb12f16e5d5a0b3ee3cfafda001a303c.tar.gz
Device megapatch 3/6:
Add missing D_TTY flags to various drivers. Complete asserts that dev_t's passed to ttyread(), ttywrite(), ttypoll() and ttykqwrite() have (d_flags & D_TTY) and a struct tty pointer. Make ttyread(), ttywrite(), ttypoll() and ttykqwrite() the default cdevsw methods for D_TTY drivers and remove the explicit initializations in various drivers cdevsw structures.
Diffstat (limited to 'sys/i386/isa')
-rw-r--r--sys/i386/isa/cy.c3
-rw-r--r--sys/i386/isa/istallion.c2
-rw-r--r--sys/i386/isa/pcvt/pcvt_drv.c4
-rw-r--r--sys/i386/isa/stallion.c4
4 files changed, 0 insertions, 13 deletions
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 4351a30..2a715c0 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -388,13 +388,10 @@ static d_ioctl_t sioioctl;
static struct cdevsw sio_cdevsw = {
.d_open = sioopen,
.d_close = sioclose,
- .d_read = ttyread,
.d_write = siowrite,
.d_ioctl = sioioctl,
- .d_poll = ttypoll,
.d_name = driver_name,
.d_flags = D_TTY,
- .d_kqfilter = ttykqfilter,
};
static int comconsole = -1;
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index e44400d..ee82892 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -648,10 +648,8 @@ static struct cdevsw stli_cdevsw = {
.d_read = stliread,
.d_write = stliwrite,
.d_ioctl = stliioctl,
- .d_poll = ttypoll,
.d_name = stli_drvname,
.d_flags = D_TTY,
- .d_kqfilter = ttykqfilter,
};
#endif
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 3510480..af16af9 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -97,14 +97,10 @@ static d_mmap_t pcvt_mmap;
static struct cdevsw vt_cdevsw = {
.d_open = pcvt_open,
.d_close = pcvt_close,
- .d_read = ttyread,
- .d_write = ttywrite,
.d_ioctl = pcvt_ioctl,
- .d_poll = ttypoll,
.d_mmap = pcvt_mmap,
.d_name = "vt",
.d_flags = D_TTY,
- .d_kqfilter = ttykqfilter,
};
static int pcvt_probe(device_t dev);
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 4665491..de0b2cc 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -539,13 +539,9 @@ COMPAT_PCI_DRIVER (stlpci, stlpcidriver);
static struct cdevsw stl_cdevsw = {
.d_open = stlopen,
.d_close = stlclose,
- .d_read = ttyread,
- .d_write = ttywrite,
.d_ioctl = stlioctl,
- .d_poll = ttypoll,
.d_name = "stl",
.d_flags = D_TTY,
- .d_kqfilter = ttykqfilter,
};
#endif
OpenPOWER on IntegriCloud