diff options
| author | ache <ache@FreeBSD.org> | 1994-12-01 23:48:09 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1994-12-01 23:48:09 +0000 |
| commit | 04188ac3ca16476d70e7822961cfafc87454fe7d (patch) | |
| tree | b6ba6a01062c4e146b0d2229b1e33886a70e55d1 /sys | |
| parent | 098465c84501c5d5bdab230a2818cbfb7f798e46 (diff) | |
| download | FreeBSD-src-04188ac3ca16476d70e7822961cfafc87454fe7d.zip FreeBSD-src-04188ac3ca16476d70e7822961cfafc87454fe7d.tar.gz | |
Change wakeup to endtsleep, because wakeup don't produce timeout
state, cause infinite wakeups loop in ttywait
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/sio/sio.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/sio.c | 7 | ||||
| -rw-r--r-- | sys/isa/sio.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 13db874..e75085a 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.59 1994/11/01 23:09:29 bde Exp $ + * $Id: sio.c,v 1.60 1994/11/06 00:23:45 bde Exp $ */ #include "sio.h" @@ -899,6 +899,7 @@ sioclose(dev, flag, mode, p) int mynor; int s; struct tty *tp; + void endtsleep __P((void *)); mynor = minor(dev); if (mynor & CONTROL_MASK) @@ -906,9 +907,9 @@ sioclose(dev, flag, mode, p) com = com_addr(MINOR_TO_UNIT(mynor)); tp = com->tp; s = spltty(); - timeout(wakeup, TSA_OCOMPLETE(tp), 60 * hz); + timeout(endtsleep, (void *)p, 60 * hz); (*linesw[tp->t_line].l_close)(tp, flag); - untimeout(wakeup, TSA_OCOMPLETE(tp)); + untimeout(endtsleep, (void *)p); siostop(tp, FREAD | FWRITE); comhardclose(com); ttyclose(tp); diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 13db874..e75085a 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.59 1994/11/01 23:09:29 bde Exp $ + * $Id: sio.c,v 1.60 1994/11/06 00:23:45 bde Exp $ */ #include "sio.h" @@ -899,6 +899,7 @@ sioclose(dev, flag, mode, p) int mynor; int s; struct tty *tp; + void endtsleep __P((void *)); mynor = minor(dev); if (mynor & CONTROL_MASK) @@ -906,9 +907,9 @@ sioclose(dev, flag, mode, p) com = com_addr(MINOR_TO_UNIT(mynor)); tp = com->tp; s = spltty(); - timeout(wakeup, TSA_OCOMPLETE(tp), 60 * hz); + timeout(endtsleep, (void *)p, 60 * hz); (*linesw[tp->t_line].l_close)(tp, flag); - untimeout(wakeup, TSA_OCOMPLETE(tp)); + untimeout(endtsleep, (void *)p); siostop(tp, FREAD | FWRITE); comhardclose(com); ttyclose(tp); diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 13db874..e75085a 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.59 1994/11/01 23:09:29 bde Exp $ + * $Id: sio.c,v 1.60 1994/11/06 00:23:45 bde Exp $ */ #include "sio.h" @@ -899,6 +899,7 @@ sioclose(dev, flag, mode, p) int mynor; int s; struct tty *tp; + void endtsleep __P((void *)); mynor = minor(dev); if (mynor & CONTROL_MASK) @@ -906,9 +907,9 @@ sioclose(dev, flag, mode, p) com = com_addr(MINOR_TO_UNIT(mynor)); tp = com->tp; s = spltty(); - timeout(wakeup, TSA_OCOMPLETE(tp), 60 * hz); + timeout(endtsleep, (void *)p, 60 * hz); (*linesw[tp->t_line].l_close)(tp, flag); - untimeout(wakeup, TSA_OCOMPLETE(tp)); + untimeout(endtsleep, (void *)p); siostop(tp, FREAD | FWRITE); comhardclose(com); ttyclose(tp); |
