[Midnightbsd-cvs] src [9907] trunk/sys/sys/ttydevsw.h: sync with freebsd 10-stable

[laffer1 at midnightbsd.org]

Revision: 9907
          http://svnweb.midnightbsd.org/src/?rev=9907
Author:   laffer1
Date:     2018-05-24 22:45:25 -0400 (Thu, 24 May 2018)
Log Message:
-----------
sync with freebsd 10-stable

Modified Paths:
--------------
    trunk/sys/sys/ttydevsw.h

Modified: trunk/sys/sys/ttydevsw.h
===================================================================
--- trunk/sys/sys/ttydevsw.h	2018-05-25 02:44:46 UTC (rev 9906)
+++ trunk/sys/sys/ttydevsw.h	2018-05-25 02:45:25 UTC (rev 9907)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2008 Ed Schouten <ed at FreeBSD.org>
  * All rights reserved.
@@ -26,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/sys/ttydevsw.h 294959 2016-01-27 22:48:04Z marius $
  */
 
 #ifndef _SYS_TTYDEVSW_H_
@@ -54,6 +55,7 @@
     vm_paddr_t * paddr, int nprot, vm_memattr_t *memattr);
 typedef void tsw_pktnotify_t(struct tty *tp, char event);
 typedef void tsw_free_t(void *softc);
+typedef bool tsw_busy_t(struct tty *tp);
 
 struct ttydevsw {
 	unsigned int	tsw_flags;	/* Default TTY flags. */
@@ -74,21 +76,25 @@
 
 	tsw_free_t	*tsw_free;	/* Destructor. */
 
-	void		*tsw_spare[4];	/* For future use. */
+	tsw_busy_t	*tsw_busy;	/* Draining output. */
+
+	void		*tsw_spare[3];	/* For future use. */
 };
 
 static __inline int
 ttydevsw_open(struct tty *tp)
 {
+
 	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
-	return tp->t_devsw->tsw_open(tp);
+	return (tp->t_devsw->tsw_open(tp));
 }
 
 static __inline void
 ttydevsw_close(struct tty *tp)
 {
+
 	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
@@ -98,6 +104,7 @@
 static __inline void
 ttydevsw_outwakeup(struct tty *tp)
 {
+
 	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
@@ -111,6 +118,7 @@
 static __inline void
 ttydevsw_inwakeup(struct tty *tp)
 {
+
 	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
@@ -124,35 +132,40 @@
 static __inline int
 ttydevsw_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
 {
+
 	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
-	return tp->t_devsw->tsw_ioctl(tp, cmd, data, td);
+	return (tp->t_devsw->tsw_ioctl(tp, cmd, data, td));
 }
 
 static __inline int
-ttydevsw_cioctl(struct tty *tp, int unit, u_long cmd, caddr_t data, struct thread *td)
+ttydevsw_cioctl(struct tty *tp, int unit, u_long cmd, caddr_t data,
+    struct thread *td)
 {
+
 	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
-	return tp->t_devsw->tsw_cioctl(tp, unit, cmd, data, td);
+	return (tp->t_devsw->tsw_cioctl(tp, unit, cmd, data, td));
 }
 
 static __inline int
 ttydevsw_param(struct tty *tp, struct termios *t)
 {
+
 	MPASS(!tty_gone(tp));
 
-	return tp->t_devsw->tsw_param(tp, t);
+	return (tp->t_devsw->tsw_param(tp, t));
 }
 
 static __inline int
 ttydevsw_modem(struct tty *tp, int sigon, int sigoff)
 {
+
 	MPASS(!tty_gone(tp));
 
-	return tp->t_devsw->tsw_modem(tp, sigon, sigoff);
+	return (tp->t_devsw->tsw_modem(tp, sigon, sigoff));
 }
 
 static __inline int
@@ -159,14 +172,16 @@
 ttydevsw_mmap(struct tty *tp, vm_ooffset_t offset, vm_paddr_t *paddr,
     int nprot, vm_memattr_t *memattr)
 {
+
 	MPASS(!tty_gone(tp));
 
-	return tp->t_devsw->tsw_mmap(tp, offset, paddr, nprot, memattr);
+	return (tp->t_devsw->tsw_mmap(tp, offset, paddr, nprot, memattr));
 }
 
 static __inline void
 ttydevsw_pktnotify(struct tty *tp, char event)
 {
+
 	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
@@ -176,9 +191,20 @@
 static __inline void
 ttydevsw_free(struct tty *tp)
 {
+
 	MPASS(tty_gone(tp));
 
 	tp->t_devsw->tsw_free(tty_softc(tp));
 }
 
+static __inline bool
+ttydevsw_busy(struct tty *tp)
+{
+
+	tty_lock_assert(tp, MA_OWNED);
+	MPASS(!tty_gone(tp));
+
+	return (tp->t_devsw->tsw_busy(tp));
+}
+
 #endif /* !_SYS_TTYDEVSW_H_ */