diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1995-07-31 21:02:00 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1995-07-31 21:02:00 +0000 |
| commit | 9fa18570a23308a712a65c3890d266c056b89430 (patch) | |
| tree | 6db12c5f3b7deb883374e9daa21609a9e76eaa85 /sys/gnu | |
| parent | 177af312cdc0d95d1cfbd1a3f2e017d1cf7bdb69 (diff) | |
Notes
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/isdn/iitty.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c index afd806d9776f0..1e2e6d4c5a8f3 100644 --- a/sys/gnu/isdn/iitty.c +++ b/sys/gnu/isdn/iitty.c @@ -1,6 +1,6 @@ -static char _ittyid[] = "@(#)$Id: iitty.c,v 1.8 1995/07/22 01:29:28 bde Exp $"; +static char _ittyid[] = "@(#)$Id: iitty.c,v 1.9 1995/07/22 16:44:26 bde Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.8 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.9 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,12 @@ static char _ittyid[] = "@(#)$Id: iitty.c,v 1.8 1995/07/22 01:29:28 bde Exp * ******************************************************************************* * $Log: iitty.c,v $ + * Revision 1.9 1995/07/22 16:44:26 bde + * Obtained from: partly from ancient patches of mine via 1.1.5 + * + * Give names to the magic tty i/o sleep addresses and use them. This makes + * it easier to remember what the addresses are for and to keep them unique. + * * Revision 1.8 1995/07/22 01:29:28 bde * Move the inline code for waking up writers to a new function * ttwwakeup(). The conditions for doing the wakeup will soon become @@ -159,7 +165,14 @@ ityopen(dev_t dev, int flag, int mode, struct proc * p) return (EBUSY); (void) spltty(); - if(OUTBOUND(dev)) tp->t_cflag |= CLOCAL; + if (OUTBOUND(dev)) { + /* + * XXX should call l_modem() here and not meddle with CLOCAL, + * but itystart() wants TS_CARR_ON to give the true carrier. + */ + tp->t_cflag |= CLOCAL; + tp->t_state |= TS_CONNECTED; + } while ((flag & O_NONBLOCK) == 0 && (tp->t_cflag & CLOCAL) == 0 && (tp->t_state & TS_CARR_ON) == 0) @@ -286,7 +299,6 @@ ity_connect(int no) return; if(OUTBOUND(tp->t_dev)) tp->t_cflag &= ~CLOCAL; (*linesw[tp->t_line].l_modem) (tp, 1); - tp->t_state |= TS_CARR_ON; tp->t_state &=~ (TS_BUSY|TS_FLUSH); if (tp->t_line) (*linesw[tp->t_line].l_start)(tp); |