summaryrefslogtreecommitdiffstats
path: root/sys/kern/tty_ttydisc.c
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2011-06-26 18:26:20 +0000
committered <ed@FreeBSD.org>2011-06-26 18:26:20 +0000
commit4ef034d1ea803fc7e2746f9360ad74f8e6ac77be (patch)
tree6dadaf4b44c7fc8c9b8f9f4d96f553859ca7411d /sys/kern/tty_ttydisc.c
parent59c238c6bed4c3688cd951c136e0cd48bc67c028 (diff)
downloadFreeBSD-src-4ef034d1ea803fc7e2746f9360ad74f8e6ac77be.zip
FreeBSD-src-4ef034d1ea803fc7e2746f9360ad74f8e6ac77be.tar.gz
Fix whitespace inconsistencies in the TTY layer and its drivers owned by me.
Diffstat (limited to 'sys/kern/tty_ttydisc.c')
-rw-r--r--sys/kern/tty_ttydisc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c
index 6afac8d..2a0bb4b 100644
--- a/sys/kern/tty_ttydisc.c
+++ b/sys/kern/tty_ttydisc.c
@@ -270,13 +270,13 @@ ttydisc_read_raw_interbyte_timer(struct tty *tp, struct uio *uio, int ioflag)
MPASS(tp->t_termios.c_cc[VMIN] != 0);
MPASS(tp->t_termios.c_cc[VTIME] != 0);
-
+
/*
* When using the interbyte timer, the timer should be started
* after the first byte has been received. We just call into the
* generic read timer code after we've received the first byte.
*/
-
+
for (;;) {
error = ttyinq_read_uio(&tp->t_inq, tp, uio,
uio->uio_resid, 0);
@@ -331,7 +331,7 @@ ttydisc_read(struct tty *tp, struct uio *uio, int ioflag)
/* Unset the input watermark when we've got enough space. */
tty_hiwat_in_unblock(tp);
}
-
+
return (error);
}
@@ -521,7 +521,7 @@ ttydisc_write(struct tty *tp, struct uio *uio, int ioflag)
error = EWOULDBLOCK;
goto done;
}
-
+
/*
* The driver may write back the data
* synchronously. Be sure to check the high
@@ -567,7 +567,7 @@ ttydisc_optimize(struct tty *tp)
} else if (!CMP_FLAG(i, ICRNL|IGNCR|IMAXBEL|INLCR|ISTRIP|IXON) &&
(!CMP_FLAG(i, BRKINT) || CMP_FLAG(i, IGNBRK)) &&
(!CMP_FLAG(i, PARMRK) ||
- CMP_FLAG(i, IGNPAR|IGNBRK) == (IGNPAR|IGNBRK)) &&
+ CMP_FLAG(i, IGNPAR|IGNBRK) == (IGNPAR|IGNBRK)) &&
!CMP_FLAG(l, ECHO|ICANON|IEXTEN|ISIG|PENDIN)) {
tp->t_flags |= TF_BYPASS;
} else {
@@ -583,7 +583,7 @@ ttydisc_modem(struct tty *tp, int open)
if (open)
cv_broadcast(&tp->t_dcdwait);
-
+
/*
* Ignore modem status lines when CLOCAL is turned on, but don't
* enter the zombie state when the TTY isn't opened, because
@@ -834,7 +834,7 @@ ttydisc_rint(struct tty *tp, char c, int flags)
if (ttyhook_hashook(tp, rint))
return ttyhook_rint(tp, c, flags);
-
+
if (tp->t_flags & TF_BYPASS)
goto processed;
@@ -1072,7 +1072,7 @@ ttydisc_rint_bypass(struct tty *tp, const void *buf, size_t len)
size_t ret;
tty_lock_assert(tp, MA_OWNED);
-
+
MPASS(tp->t_flags & TF_BYPASS);
atomic_add_long(&tty_nin, len);
@@ -1122,7 +1122,7 @@ ttydisc_rint_poll(struct tty *tp)
l = ttyinq_bytesleft(&tp->t_inq);
if (l == 0 && (tp->t_flags & TF_HIWAT_IN) == 0)
return (1);
-
+
return (l);
}
@@ -1201,7 +1201,7 @@ ttydisc_getc_uio(struct tty *tp, struct uio *uio)
tty_unlock(tp);
error = uiomove(buf, len, uio);
tty_lock(tp);
-
+
if (error != 0)
break;
}
OpenPOWER on IntegriCloud