diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cy/cy.c | 19 | ||||
| -rw-r--r-- | sys/dev/cy/cy_isa.c | 19 | ||||
| -rw-r--r-- | sys/dev/rc/rc.c | 8 | ||||
| -rw-r--r-- | sys/dev/sio/sio.c | 17 | ||||
| -rw-r--r-- | sys/dev/syscons/syscons.c | 10 |
5 files changed, 9 insertions, 64 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 090901f..338abb1 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/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/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 090901f..338abb1 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.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/dev/rc/rc.c b/sys/dev/rc/rc.c index 8eb0f93..1db4a3d 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/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/dev/sio/sio.c b/sys/dev/sio/sio.c index d880196..39683e9 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.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/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index c48d470..e00049b 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/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); } |
