Date: Thu, 17 Jul 2008 13:41:55 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 145364 for review Message-ID: <200807171341.m6HDftBC060346@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145364 Change 145364 by ed@ed_dull on 2008/07/17 13:41:31 Revert the changes to ttycom.h, now that we have COMPAT_43TTY again. Unfortunately I have to renumber TIOCPTMASTER, because it turned out 18 was used by COMPAT_43TTY to obtain the tchars. Affected files ... .. //depot/projects/mpsafetty/sys/sys/ttycom.h#3 edit Differences ... ==== //depot/projects/mpsafetty/sys/sys/ttycom.h#3 (text+ko) ==== @@ -56,40 +56,46 @@ unsigned short ws_ypixel; /* vertical size, pixels */ }; - /* 0-12 unused */ + /* 0-2 compat */ + /* 3-4 obsolete */ + /* 5-7 obsolete or unused */ + /* 8-10 compat */ + /* 11-12 obsolete or unused */ #define TIOCEXCL _IO('t', 13) /* set exclusive use of tty */ #define TIOCNXCL _IO('t', 14) /* reset exclusive use of tty */ #define TIOCGPTN _IOR('t', 15, int) /* Get pts number. */ #define TIOCFLUSH _IOW('t', 16, int) /* flush buffers */ - /* 17 unused */ -#define TIOCPTMASTER _IO('t', 18) /* pts master validation */ + /* 17-18 compat */ #define TIOCGETA _IOR('t', 19, struct termios) /* get termios struct */ #define TIOCSETA _IOW('t', 20, struct termios) /* set termios struct */ #define TIOCSETAW _IOW('t', 21, struct termios) /* drain output, set */ #define TIOCSETAF _IOW('t', 22, struct termios) /* drn out, fls in, set */ - /* 23-25 unused */ + /* 23-25 obsolete or unused */ #define TIOCGETD _IOR('t', 26, int) /* get line discipline */ #define TIOCSETD _IOW('t', 27, int) /* set line discipline */ - /* 28-69 unused */ - /* 70-79 ppp */ - /* 80-84 XXX conflicts */ +#define TIOCPTMASTER _IO('t', 28) /* pts master validation */ + /* 29-69 free */ + /* 80-84 slip */ #define TIOCGDRAINWAIT _IOR('t', 86, int) /* get ttywait timeout */ #define TIOCSDRAINWAIT _IOW('t', 87, int) /* set ttywait timeout */ - /* 88 XXX conflicts */ + /* 88 slip, ppp; conflicts */ #define TIOCTIMESTAMP _IOR('t', 89, struct timeval) /* enable/get timestamp * of last input event */ + /* 70-90 ppp; many conflicts */ #define TIOCMGDTRWAIT _IOR('t', 90, int) /* modem: get wait on close */ #define TIOCMSDTRWAIT _IOW('t', 91, int) /* modem: set wait on close */ - /* 90-92 XXX conflicts, tap */ + /* 90-92 tap; some conflicts */ #define TIOCDRAIN _IO('t', 94) /* wait till output drained */ #define TIOCSIG _IOWINT('t', 95) /* pty: generate signal */ #define TIOCEXT _IOW('t', 96, int) /* pty: external processing */ + /* 90-97 tun; some conflicts */ #define TIOCSCTTY _IO('t', 97) /* become controlling tty */ #define TIOCCONS _IOW('t', 98, int) /* become virtual console */ #define TIOCGSID _IOR('t', 99, int) /* get session id */ - /* 100 unused */ + /* 100 see consio.h */ #define TIOCSTAT _IO('t', 101) /* simulate ^T status message */ - /* 102 unused */ +#define TIOCUCNTL _IOW('t', 102, int) /* pty: set/clr usr cntl mode */ +#define UIOCCMD(n) _IO('u', n) /* usr cntl op "n" */ #define TIOCSWINSZ _IOW('t', 103, struct winsize) /* set window size */ #define TIOCGWINSZ _IOR('t', 104, struct winsize) /* get window size */ #define TIOCMGET _IOR('t', 106, int) /* get all modem bits */ @@ -122,13 +128,14 @@ #define TIOCNOTTY _IO('t', 113) /* void tty association */ #define TIOCSTI _IOW('t', 114, char) /* simulate terminal input */ #define TIOCOUTQ _IOR('t', 115, int) /* output queue size */ - /* 116-117 unused */ + /* 116-117 compat */ #define TIOCSPGRP _IOW('t', 118, int) /* set pgrp of tty */ #define TIOCGPGRP _IOR('t', 119, int) /* get pgrp of tty */ #define TIOCCDTR _IO('t', 120) /* clear data terminal ready */ #define TIOCSDTR _IO('t', 121) /* set data terminal ready */ #define TIOCCBRK _IO('t', 122) /* clear break bit */ #define TIOCSBRK _IO('t', 123) /* set break bit */ + /* 124-127 compat */ #define TTYDISC 0 /* termios tty line discipline */ #define SLIPDISC 4 /* serial IP discipline */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807171341.m6HDftBC060346>