Move the inline code for waking up writers to a new function

ttwwakeup().  The conditions for doing the wakeup will soon become
more complicated and I don't want them duplicated in all drivers.

It's probably not worth making ttwwakeup() a macro or an inline
function.  The cost of the function call is relatively small when
there is a process to wake up.  There is usually a process to wake
up for large writes and the system call overhead dwarfs the function
call overhead for small writes.

6 files changed, 15 insertions, 47 deletions

diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index c66f645..ff4b6b7 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -542,6 +542,9 @@ void cxoproc (struct tty *tp)
 	if (tp->t_state & (TS_SO_OCOMPLETE | TS_SO_OLOWAT) || tp->t_wsel)
 		ttwwakeup (tp);
 #else /* FreeBSD 2.x and BSDI */
+#ifndef TS_ASLEEP /* FreeBSD some time after 2.0.5 */
+	ttwwakeup(tp);
+#else
 	if (RB_LEN (tp->t_out) <= tp->t_lowat) {
 		if (tp->t_state & TS_ASLEEP) {
 			tp->t_state &= ~TS_ASLEEP;
@@ -550,6 +553,7 @@ void cxoproc (struct tty *tp)
 		selwakeup(&tp->t_wsel);
 	}
 #endif
+#endif
 	/*
 	 * Enable TXMPTY interrupt,
 	 * to catch the case when the second buffer is empty.
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 090901f..338abb1 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.8 1995/07/05 12:15:52 bde Exp $
+ *	$Id: cy.c,v 1.9 1995/07/21 22:51:31 bde Exp $
  */
 
 #include "cy.h"
@@ -155,8 +155,6 @@
  * XXX temporary kludges for 2.0 (XXX TK2.0).
  */
 #define	TSA_CARR_ON(tp)		((void *)&(tp)->t_rawq)
-#define	TSA_OCOMPLETE(tp)	((void *)&(tp)->t_outq)
-#define	TSA_OLOWAT(tp)		((void *)&(tp)->t_outq)
 
 #define	LOTS_OF_EVENTS	64	/* helps separate urgent events from input */
 #define	RB_I_HIGH_WATER	(TTYHOG - 2 * RS_IBUFSIZE)
@@ -2137,20 +2135,7 @@ comstart(tp)
 		siointr1(com);	/* fake interrupt to start output */
 	enable_intr();
 #endif
-
-#if 0 /* XXX TK2.0 */
-	if (tp->t_state & (TS_SO_OCOMPLETE | TS_SO_OLOWAT) || tp->t_wsel)
-		ttwwakeup(tp);
-#else
-	if (tp->t_outq.c_cc <= tp->t_lowat) {
-		if (tp->t_state & TS_ASLEEP) {
-			tp->t_state &= ~TS_ASLEEP;
-			wakeup(TSA_OLOWAT(tp));
-		}
-		selwakeup(&tp->t_wsel);
-	}
-#endif
-
+	ttwwakeup(tp);
 	splx(s);
 }
 
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index e578d4a..a8d6c98 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -974,6 +974,9 @@ pcstart(register struct tty *tp)
 		timeout(ttrstrt, tp, 1);
 	}
 
+#ifndef TS_ASLEEP /* FreeBSD some time after 2.0.5 */
+	ttwwakeup(tp);
+#else
 	if (rbp->c_cc <= tp->t_lowat)
 	{
 		if (tp->t_state&TS_ASLEEP)
@@ -983,6 +986,7 @@ pcstart(register struct tty *tp)
 		}
 		selwakeup(&tp->t_wsel);
 	}
+#endif
 out:
 	splx(s);
 }
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 8eb0f93..1db4a3d 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -551,13 +551,7 @@ register struct tty *tp;
 #ifdef RCDEBUG
 	printrcflags(rc, "rcstart");
 #endif
-	if (tp->t_outq.c_cc <= tp->t_lowat) {
-		if (tp->t_state & TS_ASLEEP) {
-			tp->t_state &= ~TS_ASLEEP;
-			wakeup((caddr_t)&tp->t_outq);
-		}
-		selwakeup(&tp->t_wsel);
-	}
+	ttwwakeup(tp);
 #ifdef RCDEBUG
 	printf("rcstart: outq = %d obuf = %d\n",
 		tp->t_outq.c_cc, rc->rc_obufend - rc->rc_optr);
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index d880196..39683e9 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.102 1995/07/05 14:30:07 bde Exp $
+ *	$Id: sio.c,v 1.103 1995/07/21 22:51:34 bde Exp $
  */
 
 #include "sio.h"
@@ -71,7 +71,6 @@
  */
 #define	TSA_CARR_ON(tp)		((void *)&(tp)->t_rawq)
 #define	TSA_OCOMPLETE(tp)	((void *)&(tp)->t_outq)
-#define	TSA_OLOWAT(tp)		((void *)&(tp)->t_outq)
 
 #define	LOTS_OF_EVENTS	64	/* helps separate urgent events from input */
 #define	RB_I_HIGH_WATER	(TTYHOG - 2 * RS_IBUFSIZE)
@@ -1868,19 +1867,7 @@ comstart(tp)
 	if (com->state >= (CS_BUSY | CS_TTGO))
 		siointr1(com);	/* fake interrupt to start output */
 	enable_intr();
-
-#if 0 /* XXX TK2.0 */
-	if (tp->t_state & (TS_SO_OCOMPLETE | TS_SO_OLOWAT) || tp->t_wsel)
-		ttwwakeup(tp);
-#else
-	if (tp->t_outq.c_cc <= tp->t_lowat) {
-		if (tp->t_state & TS_ASLEEP) {
-			tp->t_state &= ~TS_ASLEEP;
-			wakeup(TSA_OLOWAT(tp));
-		}
-		selwakeup(&tp->t_wsel);
-	}
-#endif
+	ttwwakeup(tp);
 	splx(s);
 }
 
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index c48d470..e00049b 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.119 1995/07/11 17:59:22 bde Exp $
+ *  $Id: syscons.c,v 1.120 1995/07/11 18:34:29 bde Exp $
  */
 
 #include "sc.h"
@@ -1102,13 +1102,7 @@ scstart(struct tty *tp)
 	    s = spltty();
 	}
 	tp->t_state &= ~TS_BUSY;
-	if (rbp->c_cc <= tp->t_lowat) {
-	    if (tp->t_state & TS_ASLEEP) {
-		tp->t_state &= ~TS_ASLEEP;
-		wakeup((caddr_t)rbp);
-	    }
-	    selwakeup(&tp->t_wsel);
-	}
+	ttwwakeup(tp);
     }
     splx(s);
 }