From 92915f5044c33c277eb9e759c7553e076623de85 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Thu, 1 Dec 1994 23:48:09 +0000
Subject: [PATCH] Change wakeup to endtsleep, because wakeup don't produce
 timeout state, cause infinite wakeups loop in ttywait

---
 sys/dev/sio/sio.c  | 7 ++++---
 sys/i386/isa/sio.c | 7 ++++---
 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 13db8749eedc..e75085a99dbd 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 13db8749eedc..e75085a99dbd 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 13db8749eedc..e75085a99dbd 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);