Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More tty dialin/dialout changes (t_wopen).

Browse Source 
NB: dtop is a keyboard/mouse bus and doesn't support dialout.
This commit is contained in:
jonathan 1998-03-22 07:04:13 +00:00
parent a10657ae4f
commit 6e3073d769
3 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/arch/pmax/dev/dc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dc.c,v 1.36 1998/01/12 20:12:30 thorpej Exp $ */
/* $NetBSD: dc.c,v 1.37 1998/03/22 07:04:13 jonathan Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.36 1998/01/12 20:12:30 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.37 1998/03/22 07:04:13 jonathan Exp $");
/*
* devDC7085.c --
@ -396,8 +396,7 @@ dcopen(dev, flag, mode, p)
tp->t_oproc = dcstart;
tp->t_param = dcparam;
tp->t_dev = dev;
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_WOPEN;
if ((tp->t_state & TS_ISOPEN) == 0 && tp->t_wopen == 0) {
ttychars(tp);
firstopen = 1;
#ifndef PORTSELECTOR
@ -428,9 +427,11 @@ dcopen(dev, flag, mode, p)
s = spltty();
while (!(flag & O_NONBLOCK) && !(tp->t_cflag & CLOCAL) &&
!(tp->t_state & TS_CARR_ON)) {
tp->t_state |= TS_WOPEN;
if ((error = ttysleep(tp, (caddr_t)&tp->t_rawq,
TTIPRI | PCATCH, ttopen, 0)) != 0)
tp->t_wopen++;
error = ttysleep(tp, (caddr_t)&tp->t_rawq,
TTIPRI | PCATCH, ttopen, 0);
tp->t_wopen--;
if (error != 0)
break;
}
splx(s);
@ -475,7 +476,7 @@ dcclose(dev, flag, mode, p)
}
splx(s);
(*linesw[tp->t_line].l_close)(tp, flag);
if ((tp->t_cflag & HUPCL) || (tp->t_state & TS_WOPEN) ||
if ((tp->t_cflag & HUPCL) || tp->t_wopen ||
!(tp->t_state & TS_ISOPEN))
(void) dcmctl(dev, 0, DMSET);
return (ttyclose(tp));
@ -760,7 +761,7 @@ dcrint(sc)
if (!(tp->t_state & TS_ISOPEN)) {
wakeup((caddr_t)&tp->t_rawq);
#ifdef PORTSELECTOR
if (!(tp->t_state & TS_WOPEN))
if (tp->t_wopen == 0)
#endif
return;
}

17
sys/arch/pmax/dev/dtop.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dtop.c,v 1.30 1998/01/12 20:12:31 thorpej Exp $ */
/* $NetBSD: dtop.c,v 1.31 1998/03/22 07:04:13 jonathan Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -94,7 +94,7 @@ SOFTWARE.
********************************************************/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.30 1998/01/12 20:12:31 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.31 1998/03/22 07:04:13 jonathan Exp $");
#include "rasterconsole.h"
@ -293,10 +293,9 @@ dtopopen(dev, flag, mode, p)
tp->t_oproc = dtopstart;
tp->t_param = dtopparam;
tp->t_dev = dev;
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_WOPEN;
firstopen = 1;
if ((tp->t_state & TS_ISOPEN) == 0 && tp->t_wopen == 0) {
ttychars(tp);
firstopen = 1;
if (tp->t_ispeed == 0) {
tp->t_iflag = TTYDEF_IFLAG;
tp->t_oflag = TTYDEF_OFLAG;
@ -311,9 +310,11 @@ dtopopen(dev, flag, mode, p)
s = spltty();
while (!(flag & O_NONBLOCK) && !(tp->t_cflag & CLOCAL) &&
!(tp->t_state & TS_CARR_ON)) {
tp->t_state |= TS_WOPEN;
if ((error = ttysleep(tp, (caddr_t)&tp->t_rawq,
TTIPRI | PCATCH, ttopen, 0)) != 0)
tp->t_wopen++;
error = ttysleep(tp, (caddr_t)&tp->t_rawq,
TTIPRI | PCATCH, ttopen, 0);
tp->t_wopen--;
if (error != 0)
break;
}
splx(s);

21
sys/arch/pmax/tc/scc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scc.c,v 1.32 1998/02/05 01:57:35 jonathan Exp $ */
/* $NetBSD: scc.c,v 1.33 1998/03/22 07:04:14 jonathan Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.32 1998/02/05 01:57:35 jonathan Exp $");
__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.33 1998/03/22 07:04:14 jonathan Exp $");
/*
* Intel 82530 dual usart chip driver. Supports the serial port(s) on the
@ -775,10 +775,9 @@ sccopen(dev, flag, mode, p)
tp->t_oproc = sccstart;
tp->t_param = sccparam;
tp->t_dev = dev;
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_WOPEN;
firstopen = 1;
if ((tp->t_state & TS_ISOPEN) == 0 && tp->t_wopen == 0) {
ttychars(tp);
firstopen = 1;
#ifndef PORTSELECTOR
if (tp->t_ispeed == 0) {
#endif
@ -801,9 +800,11 @@ sccopen(dev, flag, mode, p)
s = spltty();
while (!(flag & O_NONBLOCK) && !(tp->t_cflag & CLOCAL) &&
!(tp->t_state & TS_CARR_ON)) {
tp->t_state |= TS_WOPEN;
if ((error = ttysleep(tp, (caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
ttopen, 0)) != 0)
tp->t_wopen++;
error = ttysleep(tp, (caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
ttopen, 0);
tp->t_wopen--;
if (error != 0)
break;
}
splx(s);
@ -840,7 +841,7 @@ sccclose(dev, flag, mode, p)
ttyoutput(0, tp);
}
(*linesw[tp->t_line].l_close)(tp, flag);
if ((tp->t_cflag & HUPCL) || (tp->t_state & TS_WOPEN) ||
if ((tp->t_cflag & HUPCL) || tp->t_wopen ||
!(tp->t_state & TS_ISOPEN))
(void) sccmctl(dev, 0, DMSET);
return (ttyclose(tp));
@ -1256,7 +1257,7 @@ sccintr(xxxsc)
if (!(tp->t_state & TS_ISOPEN)) {
wakeup((caddr_t)&tp->t_rawq);
#ifdef PORTSELECTOR
if (!(tp->t_state & TS_WOPEN))
if (tp->t_wopen == 0)
#endif
continue;
}