diff options
| author | bde <bde@FreeBSD.org> | 1998-08-23 08:26:42 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-08-23 08:26:42 +0000 |
| commit | 35fa8731253a1d4dacf0c2c7d39f2b77cd4bcc0c (patch) | |
| tree | 89e7eed7449d834bed22fb54542711e65643ac81 /sys/dev/si/si.c | |
| parent | a86ea80a2987ff6a41fbe0c94f9029e6d2b6af5d (diff) | |
| download | FreeBSD-src-35fa8731253a1d4dacf0c2c7d39f2b77cd4bcc0c.zip FreeBSD-src-35fa8731253a1d4dacf0c2c7d39f2b77cd4bcc0c.tar.gz | |
Added D_TTY to the cdevswitch flags for all tty drivers. This is required
for the Lite2 fix for always returning EIO in dead_read().
Cleaned up the cdevswitch initializers for all tty drivers.
Removed explicit calls to ttsetwater() from all (tty) drivers. ttsetwater()
is now called centrally for opens, not just for parameter changes.
Diffstat (limited to 'sys/dev/si/si.c')
| -rw-r--r-- | sys/dev/si/si.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 4b37f61..8b7dc26 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.74 1998/08/16 00:57:07 bde Exp $ + * $Id: si.c,v 1.75 1998/08/16 01:04:48 bde Exp $ */ #ifndef lint @@ -173,12 +173,14 @@ static d_ioctl_t siioctl; static d_stop_t sistop; static d_devtotty_t sidevtotty; -#define CDEV_MAJOR 68 -static struct cdevsw si_cdevsw = - { siopen, siclose, siread, siwrite, /*68*/ - siioctl, sistop, noreset, sidevtotty,/* si */ - ttpoll, nommap, NULL, "si", NULL, -1 }; - +#define CDEV_MAJOR 68 +static struct cdevsw si_cdevsw = { + siopen, siclose, siread, siwrite, + siioctl, sistop, noreset, sidevtotty, + ttpoll, nommap, NULL, "si", + NULL, -1, nodump, nopsize, + D_TTY, +}; #ifdef SI_DEBUG /* use: ``options "SI_DEBUG"'' in your config file */ @@ -1232,8 +1234,6 @@ open_top: goto out; /* XXX: we should goto_top if siparam slept */ - ttsetwater(tp); - /* set initial DCD state */ pp->sp_last_hi_ip = ccbp->hi_ip; if ((pp->sp_last_hi_ip & IP_DCD) || IS_CALLOUT(mynor)) { |
