summaryrefslogtreecommitdiffstats
path: root/sys/dev/uart/uart_tty.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/uart/uart_tty.c')
-rw-r--r--sys/dev/uart/uart_tty.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index f306af5..2170108 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -168,6 +168,14 @@ uart_tty_outwakeup(struct tty *tp)
if (sc->sc_txbusy)
return;
+ /*
+ * Respect RTS/CTS (output) flow control if enabled and not already
+ * handled by hardware.
+ */
+ if ((tp->t_termios.c_cflag & CCTS_OFLOW) && !sc->sc_hwoflow &&
+ !(sc->sc_hwsig & SER_CTS))
+ return;
+
sc->sc_txdatasz = ttydisc_getc(tp, sc->sc_txbuf, sc->sc_txfifosz);
if (sc->sc_txdatasz != 0)
UART_TRANSMIT(sc);
@@ -315,11 +323,8 @@ uart_tty_intr(void *arg)
sig = pend & SER_INT_SIGMASK;
if (sig & SER_DDCD)
ttydisc_modem(tp, sig & SER_DCD);
- if ((sig & SER_DCTS) && (tp->t_termios.c_cflag & CCTS_OFLOW) &&
- !sc->sc_hwoflow) {
- if (sig & SER_CTS)
- uart_tty_outwakeup(tp);
- }
+ if (sig & SER_DCTS)
+ uart_tty_outwakeup(tp);
}
if (pend & SER_INT_TXIDLE)
OpenPOWER on IntegriCloud