svn commit: r199898 - in head: include sys/sys
Ed Schouten
ed at FreeBSD.org
Sat Nov 28 23:50:49 UTC 2009
Author: ed
Date: Sat Nov 28 23:50:48 2009
New Revision: 199898
URL: http://svn.freebsd.org/changeset/base/199898
Log:
Decompose <sys/termios.h>.
The <sys/termios.h> header file is hardlinked to <termios.h>. It
contains both the structures and the flag definitions, but also the C
library interface that's implemented by the C library.
This header file has the typical problem of including too many random
things and being badly ordered. Instead of trying to fix this, decompose
it into two header files:
- <sys/_termios.h>, which contains struct termios and the flags.
- <termios.h>, which includes <sys/_termios.h> and contains the C
library interface.
This means userspace has to include <termios.h> for struct termios,
while kernelspace code has to include <sys/tty.h>. Also add a
<sys/termios.h>, which prints a warning message before including
<termios.h>. I am aware that there are some applications that use this
header file as well.
Added:
head/include/termios.h
- copied, changed from r199870, head/sys/sys/termios.h
head/sys/sys/_termios.h
- copied, changed from r199870, head/sys/sys/termios.h
Modified:
head/include/Makefile
head/sys/sys/termios.h
head/sys/sys/tty.h
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Sat Nov 28 21:42:39 2009 (r199897)
+++ head/include/Makefile Sat Nov 28 23:50:48 2009 (r199898)
@@ -21,7 +21,7 @@ INCS= a.out.h ar.h assert.h bitstring.h
res_update.h resolv.h runetype.h search.h setjmp.h \
signal.h spawn.h stab.h \
stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \
- strings.h sysexits.h tar.h tgmath.h \
+ strings.h sysexits.h tar.h termios.h tgmath.h \
time.h timeconv.h timers.h ttyent.h \
ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \
wctype.h wordexp.h
@@ -31,7 +31,7 @@ MHDRS= float.h floatingpoint.h stdarg.h
PHDRS= sched.h semaphore.h _semaphore.h
LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \
- termios.h ucontext.h
+ ucontext.h
LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
netipsec ${_netipx} netnatm ${_netncp} netsmb \
Copied and modified: head/include/termios.h (from r199870, head/sys/sys/termios.h)
==============================================================================
--- head/sys/sys/termios.h Sat Nov 28 00:50:09 2009 (r199870, copy source)
+++ head/include/termios.h Sat Nov 28 23:50:48 2009 (r199898)
@@ -30,208 +30,22 @@
* $FreeBSD$
*/
-#ifndef _SYS_TERMIOS_H_
-#define _SYS_TERMIOS_H_
+#ifndef _TERMIOS_H_
+#define _TERMIOS_H_
+#include <sys/cdefs.h>
+#include <sys/_termios.h>
#include <sys/_types.h>
+
#ifndef _PID_T_DECLARED
typedef __pid_t pid_t;
#define _PID_T_DECLARED
#endif
-/*
- * Special Control Characters
- *
- * Index into c_cc[] character array.
- *
- * Name Subscript Enabled by
- */
-#define VEOF 0 /* ICANON */
-#define VEOL 1 /* ICANON */
-#ifndef _POSIX_SOURCE
-#define VEOL2 2 /* ICANON together with IEXTEN */
-#endif
-#define VERASE 3 /* ICANON */
-#ifndef _POSIX_SOURCE
-#define VWERASE 4 /* ICANON together with IEXTEN */
-#endif
-#define VKILL 5 /* ICANON */
-#ifndef _POSIX_SOURCE
-#define VREPRINT 6 /* ICANON together with IEXTEN */
-#define VERASE2 7 /* ICANON */
-#endif
-/* 7 ex-spare 1 */
-#define VINTR 8 /* ISIG */
-#define VQUIT 9 /* ISIG */
-#define VSUSP 10 /* ISIG */
-#ifndef _POSIX_SOURCE
-#define VDSUSP 11 /* ISIG together with IEXTEN */
-#endif
-#define VSTART 12 /* IXON, IXOFF */
-#define VSTOP 13 /* IXON, IXOFF */
-#ifndef _POSIX_SOURCE
-#define VLNEXT 14 /* IEXTEN */
-#define VDISCARD 15 /* IEXTEN */
-#endif
-#define VMIN 16 /* !ICANON */
-#define VTIME 17 /* !ICANON */
-#ifndef _POSIX_SOURCE
-#define VSTATUS 18 /* ICANON together with IEXTEN */
-/* 19 spare 2 */
-#endif
-#define NCCS 20
-
-#define _POSIX_VDISABLE 0xff
-
-/*
- * Input flags - software input processing
- */
-#define IGNBRK 0x00000001 /* ignore BREAK condition */
-#define BRKINT 0x00000002 /* map BREAK to SIGINTR */
-#define IGNPAR 0x00000004 /* ignore (discard) parity errors */
-#define PARMRK 0x00000008 /* mark parity and framing errors */
-#define INPCK 0x00000010 /* enable checking of parity errors */
-#define ISTRIP 0x00000020 /* strip 8th bit off chars */
-#define INLCR 0x00000040 /* map NL into CR */
-#define IGNCR 0x00000080 /* ignore CR */
-#define ICRNL 0x00000100 /* map CR to NL (ala CRMOD) */
-#define IXON 0x00000200 /* enable output flow control */
-#define IXOFF 0x00000400 /* enable input flow control */
-#ifndef _POSIX_SOURCE
-#define IXANY 0x00000800 /* any char will restart after stop */
-#define IMAXBEL 0x00002000 /* ring bell on input queue full */
-#endif /*_POSIX_SOURCE */
-
-/*
- * Output flags - software output processing
- */
-#define OPOST 0x00000001 /* enable following output processing */
#ifndef _POSIX_SOURCE
-#define ONLCR 0x00000002 /* map NL to CR-NL (ala CRMOD) */
-#define TABDLY 0x00000004 /* tab delay mask */
-#define TAB0 0x00000000 /* no tab delay and expansion */
-#define TAB3 0x00000004 /* expand tabs to spaces */
-#ifndef _KERNEL
#define OXTABS TAB3
-#endif /* !_KERNEL */
-#define ONOEOT 0x00000008 /* discard EOT's (^D) on output) */
-#define OCRNL 0x00000010 /* map CR to NL on output */
-#define ONOCR 0x00000020 /* no CR output at column 0 */
-#define ONLRET 0x00000040 /* NL performs CR function */
-#endif /*_POSIX_SOURCE */
-
-/*
- * Control flags - hardware control of terminal
- */
-#ifndef _POSIX_SOURCE
-#define CIGNORE 0x00000001 /* ignore control flags */
-#endif
-#define CSIZE 0x00000300 /* character size mask */
-#define CS5 0x00000000 /* 5 bits (pseudo) */
-#define CS6 0x00000100 /* 6 bits */
-#define CS7 0x00000200 /* 7 bits */
-#define CS8 0x00000300 /* 8 bits */
-#define CSTOPB 0x00000400 /* send 2 stop bits */
-#define CREAD 0x00000800 /* enable receiver */
-#define PARENB 0x00001000 /* parity enable */
-#define PARODD 0x00002000 /* odd parity, else even */
-#define HUPCL 0x00004000 /* hang up on last close */
-#define CLOCAL 0x00008000 /* ignore modem status lines */
-#ifndef _POSIX_SOURCE
-#define CCTS_OFLOW 0x00010000 /* CTS flow control of output */
-#define CRTSCTS (CCTS_OFLOW | CRTS_IFLOW)
-#define CRTS_IFLOW 0x00020000 /* RTS flow control of input */
-#define CDTR_IFLOW 0x00040000 /* DTR flow control of input */
-#define CDSR_OFLOW 0x00080000 /* DSR flow control of output */
-#define CCAR_OFLOW 0x00100000 /* DCD flow control of output */
-#ifndef _KERNEL
#define MDMBUF CCAR_OFLOW
-#endif /* !_KERNEL */
-#endif
-
-
-/*
- * "Local" flags - dumping ground for other state
- *
- * Warning: some flags in this structure begin with
- * the letter "I" and look like they belong in the
- * input flag.
- */
-
-#ifndef _POSIX_SOURCE
-#define ECHOKE 0x00000001 /* visual erase for line kill */
-#endif /*_POSIX_SOURCE */
-#define ECHOE 0x00000002 /* visually erase chars */
-#define ECHOK 0x00000004 /* echo NL after line kill */
-#define ECHO 0x00000008 /* enable echoing */
-#define ECHONL 0x00000010 /* echo NL even if ECHO is off */
-#ifndef _POSIX_SOURCE
-#define ECHOPRT 0x00000020 /* visual erase mode for hardcopy */
-#define ECHOCTL 0x00000040 /* echo control chars as ^(Char) */
-#endif /*_POSIX_SOURCE */
-#define ISIG 0x00000080 /* enable signals INTR, QUIT, [D]SUSP */
-#define ICANON 0x00000100 /* canonicalize input lines */
-#ifndef _POSIX_SOURCE
-#define ALTWERASE 0x00000200 /* use alternate WERASE algorithm */
-#endif /*_POSIX_SOURCE */
-#define IEXTEN 0x00000400 /* enable DISCARD and LNEXT */
-#define EXTPROC 0x00000800 /* external processing */
-#define TOSTOP 0x00400000 /* stop background jobs from output */
-#ifndef _POSIX_SOURCE
-#define FLUSHO 0x00800000 /* output being flushed (state) */
-#define NOKERNINFO 0x02000000 /* no kernel output from VSTATUS */
-#define PENDIN 0x20000000 /* XXX retype pending input (state) */
-#endif /*_POSIX_SOURCE */
-#define NOFLSH 0x80000000 /* don't flush after interrupt */
-
-typedef unsigned int tcflag_t;
-typedef unsigned char cc_t;
-typedef unsigned int speed_t;
-
-struct termios {
- tcflag_t c_iflag; /* input flags */
- tcflag_t c_oflag; /* output flags */
- tcflag_t c_cflag; /* control flags */
- tcflag_t c_lflag; /* local flags */
- cc_t c_cc[NCCS]; /* control chars */
- speed_t c_ispeed; /* input speed */
- speed_t c_ospeed; /* output speed */
-};
-
-/*
- * Standard speeds
- */
-#define B0 0
-#define B50 50
-#define B75 75
-#define B110 110
-#define B134 134
-#define B150 150
-#define B200 200
-#define B300 300
-#define B600 600
-#define B1200 1200
-#define B1800 1800
-#define B2400 2400
-#define B4800 4800
-#define B9600 9600
-#define B19200 19200
-#define B38400 38400
-#ifndef _POSIX_SOURCE
-#define B7200 7200
-#define B14400 14400
-#define B28800 28800
-#define B57600 57600
-#define B76800 76800
-#define B115200 115200
-#define B230400 230400
-#define B460800 460800
-#define B921600 921600
-#define EXTA 19200
-#define EXTB 38400
-#endif /* !_POSIX_SOURCE */
-
-#ifndef _KERNEL
+#endif
#ifndef _POSIX_SOURCE
#define CCEQ(val, c) ((c) == (val) && (val) != _POSIX_VDISABLE)
@@ -255,8 +69,6 @@ struct termios {
#define TCIOFF 3
#define TCION 4
-#include <sys/cdefs.h>
-
__BEGIN_DECLS
speed_t cfgetispeed(const struct termios *);
speed_t cfgetospeed(const struct termios *);
@@ -280,23 +92,9 @@ int cfsetspeed(struct termios *, speed_t
#endif
__END_DECLS
-#endif /* !_KERNEL */
+#endif /* !_TERMIOS_H_ */
#ifndef _POSIX_SOURCE
-
-/*
- * Include tty ioctl's that aren't just for backwards compatibility
- * with the old tty driver. These ioctl definitions were previously
- * in <sys/ioctl.h>.
- */
#include <sys/ttycom.h>
-#endif
-
-/*
- * END OF PROTECTED INCLUDE.
- */
-#endif /* !_SYS_TERMIOS_H_ */
-
-#ifndef _POSIX_SOURCE
#include <sys/ttydefaults.h>
#endif
Copied and modified: head/sys/sys/_termios.h (from r199870, head/sys/sys/termios.h)
==============================================================================
--- head/sys/sys/termios.h Sat Nov 28 00:50:09 2009 (r199870, copy source)
+++ head/sys/sys/_termios.h Sat Nov 28 23:50:48 2009 (r199898)
@@ -30,14 +30,8 @@
* $FreeBSD$
*/
-#ifndef _SYS_TERMIOS_H_
-#define _SYS_TERMIOS_H_
-
-#include <sys/_types.h>
-#ifndef _PID_T_DECLARED
-typedef __pid_t pid_t;
-#define _PID_T_DECLARED
-#endif
+#ifndef _SYS__TERMIOS_H_
+#define _SYS__TERMIOS_H_
/*
* Special Control Characters
@@ -111,9 +105,6 @@ typedef __pid_t pid_t;
#define TABDLY 0x00000004 /* tab delay mask */
#define TAB0 0x00000000 /* no tab delay and expansion */
#define TAB3 0x00000004 /* expand tabs to spaces */
-#ifndef _KERNEL
-#define OXTABS TAB3
-#endif /* !_KERNEL */
#define ONOEOT 0x00000008 /* discard EOT's (^D) on output) */
#define OCRNL 0x00000010 /* map CR to NL on output */
#define ONOCR 0x00000020 /* no CR output at column 0 */
@@ -144,9 +135,6 @@ typedef __pid_t pid_t;
#define CDTR_IFLOW 0x00040000 /* DTR flow control of input */
#define CDSR_OFLOW 0x00080000 /* DSR flow control of output */
#define CCAR_OFLOW 0x00100000 /* DCD flow control of output */
-#ifndef _KERNEL
-#define MDMBUF CCAR_OFLOW
-#endif /* !_KERNEL */
#endif
@@ -184,20 +172,6 @@ typedef __pid_t pid_t;
#endif /*_POSIX_SOURCE */
#define NOFLSH 0x80000000 /* don't flush after interrupt */
-typedef unsigned int tcflag_t;
-typedef unsigned char cc_t;
-typedef unsigned int speed_t;
-
-struct termios {
- tcflag_t c_iflag; /* input flags */
- tcflag_t c_oflag; /* output flags */
- tcflag_t c_cflag; /* control flags */
- tcflag_t c_lflag; /* local flags */
- cc_t c_cc[NCCS]; /* control chars */
- speed_t c_ispeed; /* input speed */
- speed_t c_ospeed; /* output speed */
-};
-
/*
* Standard speeds
*/
@@ -231,72 +205,18 @@ struct termios {
#define EXTB 38400
#endif /* !_POSIX_SOURCE */
-#ifndef _KERNEL
-
-#ifndef _POSIX_SOURCE
-#define CCEQ(val, c) ((c) == (val) && (val) != _POSIX_VDISABLE)
-#endif
-
-/*
- * Commands passed to tcsetattr() for setting the termios structure.
- */
-#define TCSANOW 0 /* make change immediate */
-#define TCSADRAIN 1 /* drain output, then change */
-#define TCSAFLUSH 2 /* drain output, flush input */
-#ifndef _POSIX_SOURCE
-#define TCSASOFT 0x10 /* flag - don't alter h.w. state */
-#endif
-
-#define TCIFLUSH 1
-#define TCOFLUSH 2
-#define TCIOFLUSH 3
-#define TCOOFF 1
-#define TCOON 2
-#define TCIOFF 3
-#define TCION 4
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-speed_t cfgetispeed(const struct termios *);
-speed_t cfgetospeed(const struct termios *);
-int cfsetispeed(struct termios *, speed_t);
-int cfsetospeed(struct termios *, speed_t);
-int tcgetattr(int, struct termios *);
-int tcsetattr(int, int, const struct termios *);
-int tcdrain(int);
-int tcflow(int, int);
-int tcflush(int, int);
-int tcsendbreak(int, int);
-
-#if __POSIX_VISIBLE >= 200112 || __BSD_VISIBLE
-pid_t tcgetsid(int);
-#endif
-#if __BSD_VISIBLE
-int tcsetsid(int, pid_t);
-
-void cfmakeraw(struct termios *);
-int cfsetspeed(struct termios *, speed_t);
-#endif
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#ifndef _POSIX_SOURCE
-
-/*
- * Include tty ioctl's that aren't just for backwards compatibility
- * with the old tty driver. These ioctl definitions were previously
- * in <sys/ioctl.h>.
- */
-#include <sys/ttycom.h>
-#endif
+typedef unsigned int tcflag_t;
+typedef unsigned char cc_t;
+typedef unsigned int speed_t;
-/*
- * END OF PROTECTED INCLUDE.
- */
-#endif /* !_SYS_TERMIOS_H_ */
+struct termios {
+ tcflag_t c_iflag; /* input flags */
+ tcflag_t c_oflag; /* output flags */
+ tcflag_t c_cflag; /* control flags */
+ tcflag_t c_lflag; /* local flags */
+ cc_t c_cc[NCCS]; /* control chars */
+ speed_t c_ispeed; /* input speed */
+ speed_t c_ospeed; /* output speed */
+};
-#ifndef _POSIX_SOURCE
-#include <sys/ttydefaults.h>
-#endif
+#endif /* !_SYS__TERMIOS_H_ */
Modified: head/sys/sys/termios.h
==============================================================================
--- head/sys/sys/termios.h Sat Nov 28 21:42:39 2009 (r199897)
+++ head/sys/sys/termios.h Sat Nov 28 23:50:48 2009 (r199898)
@@ -1,302 +1,5 @@
-/*-
- * Copyright (c) 1988, 1989, 1993, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)termios.h 8.3 (Berkeley) 3/28/94
- * $FreeBSD$
- */
-
-#ifndef _SYS_TERMIOS_H_
-#define _SYS_TERMIOS_H_
-
-#include <sys/_types.h>
-#ifndef _PID_T_DECLARED
-typedef __pid_t pid_t;
-#define _PID_T_DECLARED
-#endif
-
-/*
- * Special Control Characters
- *
- * Index into c_cc[] character array.
- *
- * Name Subscript Enabled by
- */
-#define VEOF 0 /* ICANON */
-#define VEOL 1 /* ICANON */
-#ifndef _POSIX_SOURCE
-#define VEOL2 2 /* ICANON together with IEXTEN */
-#endif
-#define VERASE 3 /* ICANON */
-#ifndef _POSIX_SOURCE
-#define VWERASE 4 /* ICANON together with IEXTEN */
-#endif
-#define VKILL 5 /* ICANON */
-#ifndef _POSIX_SOURCE
-#define VREPRINT 6 /* ICANON together with IEXTEN */
-#define VERASE2 7 /* ICANON */
-#endif
-/* 7 ex-spare 1 */
-#define VINTR 8 /* ISIG */
-#define VQUIT 9 /* ISIG */
-#define VSUSP 10 /* ISIG */
-#ifndef _POSIX_SOURCE
-#define VDSUSP 11 /* ISIG together with IEXTEN */
-#endif
-#define VSTART 12 /* IXON, IXOFF */
-#define VSTOP 13 /* IXON, IXOFF */
-#ifndef _POSIX_SOURCE
-#define VLNEXT 14 /* IEXTEN */
-#define VDISCARD 15 /* IEXTEN */
-#endif
-#define VMIN 16 /* !ICANON */
-#define VTIME 17 /* !ICANON */
-#ifndef _POSIX_SOURCE
-#define VSTATUS 18 /* ICANON together with IEXTEN */
-/* 19 spare 2 */
-#endif
-#define NCCS 20
-
-#define _POSIX_VDISABLE 0xff
-
-/*
- * Input flags - software input processing
- */
-#define IGNBRK 0x00000001 /* ignore BREAK condition */
-#define BRKINT 0x00000002 /* map BREAK to SIGINTR */
-#define IGNPAR 0x00000004 /* ignore (discard) parity errors */
-#define PARMRK 0x00000008 /* mark parity and framing errors */
-#define INPCK 0x00000010 /* enable checking of parity errors */
-#define ISTRIP 0x00000020 /* strip 8th bit off chars */
-#define INLCR 0x00000040 /* map NL into CR */
-#define IGNCR 0x00000080 /* ignore CR */
-#define ICRNL 0x00000100 /* map CR to NL (ala CRMOD) */
-#define IXON 0x00000200 /* enable output flow control */
-#define IXOFF 0x00000400 /* enable input flow control */
-#ifndef _POSIX_SOURCE
-#define IXANY 0x00000800 /* any char will restart after stop */
-#define IMAXBEL 0x00002000 /* ring bell on input queue full */
-#endif /*_POSIX_SOURCE */
-
-/*
- * Output flags - software output processing
- */
-#define OPOST 0x00000001 /* enable following output processing */
-#ifndef _POSIX_SOURCE
-#define ONLCR 0x00000002 /* map NL to CR-NL (ala CRMOD) */
-#define TABDLY 0x00000004 /* tab delay mask */
-#define TAB0 0x00000000 /* no tab delay and expansion */
-#define TAB3 0x00000004 /* expand tabs to spaces */
-#ifndef _KERNEL
-#define OXTABS TAB3
-#endif /* !_KERNEL */
-#define ONOEOT 0x00000008 /* discard EOT's (^D) on output) */
-#define OCRNL 0x00000010 /* map CR to NL on output */
-#define ONOCR 0x00000020 /* no CR output at column 0 */
-#define ONLRET 0x00000040 /* NL performs CR function */
-#endif /*_POSIX_SOURCE */
-
-/*
- * Control flags - hardware control of terminal
- */
-#ifndef _POSIX_SOURCE
-#define CIGNORE 0x00000001 /* ignore control flags */
-#endif
-#define CSIZE 0x00000300 /* character size mask */
-#define CS5 0x00000000 /* 5 bits (pseudo) */
-#define CS6 0x00000100 /* 6 bits */
-#define CS7 0x00000200 /* 7 bits */
-#define CS8 0x00000300 /* 8 bits */
-#define CSTOPB 0x00000400 /* send 2 stop bits */
-#define CREAD 0x00000800 /* enable receiver */
-#define PARENB 0x00001000 /* parity enable */
-#define PARODD 0x00002000 /* odd parity, else even */
-#define HUPCL 0x00004000 /* hang up on last close */
-#define CLOCAL 0x00008000 /* ignore modem status lines */
-#ifndef _POSIX_SOURCE
-#define CCTS_OFLOW 0x00010000 /* CTS flow control of output */
-#define CRTSCTS (CCTS_OFLOW | CRTS_IFLOW)
-#define CRTS_IFLOW 0x00020000 /* RTS flow control of input */
-#define CDTR_IFLOW 0x00040000 /* DTR flow control of input */
-#define CDSR_OFLOW 0x00080000 /* DSR flow control of output */
-#define CCAR_OFLOW 0x00100000 /* DCD flow control of output */
-#ifndef _KERNEL
-#define MDMBUF CCAR_OFLOW
-#endif /* !_KERNEL */
-#endif
-
-
-/*
- * "Local" flags - dumping ground for other state
- *
- * Warning: some flags in this structure begin with
- * the letter "I" and look like they belong in the
- * input flag.
- */
-
-#ifndef _POSIX_SOURCE
-#define ECHOKE 0x00000001 /* visual erase for line kill */
-#endif /*_POSIX_SOURCE */
-#define ECHOE 0x00000002 /* visually erase chars */
-#define ECHOK 0x00000004 /* echo NL after line kill */
-#define ECHO 0x00000008 /* enable echoing */
-#define ECHONL 0x00000010 /* echo NL even if ECHO is off */
-#ifndef _POSIX_SOURCE
-#define ECHOPRT 0x00000020 /* visual erase mode for hardcopy */
-#define ECHOCTL 0x00000040 /* echo control chars as ^(Char) */
-#endif /*_POSIX_SOURCE */
-#define ISIG 0x00000080 /* enable signals INTR, QUIT, [D]SUSP */
-#define ICANON 0x00000100 /* canonicalize input lines */
-#ifndef _POSIX_SOURCE
-#define ALTWERASE 0x00000200 /* use alternate WERASE algorithm */
-#endif /*_POSIX_SOURCE */
-#define IEXTEN 0x00000400 /* enable DISCARD and LNEXT */
-#define EXTPROC 0x00000800 /* external processing */
-#define TOSTOP 0x00400000 /* stop background jobs from output */
-#ifndef _POSIX_SOURCE
-#define FLUSHO 0x00800000 /* output being flushed (state) */
-#define NOKERNINFO 0x02000000 /* no kernel output from VSTATUS */
-#define PENDIN 0x20000000 /* XXX retype pending input (state) */
-#endif /*_POSIX_SOURCE */
-#define NOFLSH 0x80000000 /* don't flush after interrupt */
-
-typedef unsigned int tcflag_t;
-typedef unsigned char cc_t;
-typedef unsigned int speed_t;
-
-struct termios {
- tcflag_t c_iflag; /* input flags */
- tcflag_t c_oflag; /* output flags */
- tcflag_t c_cflag; /* control flags */
- tcflag_t c_lflag; /* local flags */
- cc_t c_cc[NCCS]; /* control chars */
- speed_t c_ispeed; /* input speed */
- speed_t c_ospeed; /* output speed */
-};
-
-/*
- * Standard speeds
- */
-#define B0 0
-#define B50 50
-#define B75 75
-#define B110 110
-#define B134 134
-#define B150 150
-#define B200 200
-#define B300 300
-#define B600 600
-#define B1200 1200
-#define B1800 1800
-#define B2400 2400
-#define B4800 4800
-#define B9600 9600
-#define B19200 19200
-#define B38400 38400
-#ifndef _POSIX_SOURCE
-#define B7200 7200
-#define B14400 14400
-#define B28800 28800
-#define B57600 57600
-#define B76800 76800
-#define B115200 115200
-#define B230400 230400
-#define B460800 460800
-#define B921600 921600
-#define EXTA 19200
-#define EXTB 38400
-#endif /* !_POSIX_SOURCE */
-
-#ifndef _KERNEL
-
-#ifndef _POSIX_SOURCE
-#define CCEQ(val, c) ((c) == (val) && (val) != _POSIX_VDISABLE)
-#endif
-
-/*
- * Commands passed to tcsetattr() for setting the termios structure.
- */
-#define TCSANOW 0 /* make change immediate */
-#define TCSADRAIN 1 /* drain output, then change */
-#define TCSAFLUSH 2 /* drain output, flush input */
-#ifndef _POSIX_SOURCE
-#define TCSASOFT 0x10 /* flag - don't alter h.w. state */
-#endif
-
-#define TCIFLUSH 1
-#define TCOFLUSH 2
-#define TCIOFLUSH 3
-#define TCOOFF 1
-#define TCOON 2
-#define TCIOFF 3
-#define TCION 4
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-speed_t cfgetispeed(const struct termios *);
-speed_t cfgetospeed(const struct termios *);
-int cfsetispeed(struct termios *, speed_t);
-int cfsetospeed(struct termios *, speed_t);
-int tcgetattr(int, struct termios *);
-int tcsetattr(int, int, const struct termios *);
-int tcdrain(int);
-int tcflow(int, int);
-int tcflush(int, int);
-int tcsendbreak(int, int);
-
-#if __POSIX_VISIBLE >= 200112 || __BSD_VISIBLE
-pid_t tcgetsid(int);
-#endif
-#if __BSD_VISIBLE
-int tcsetsid(int, pid_t);
-
-void cfmakeraw(struct termios *);
-int cfsetspeed(struct termios *, speed_t);
-#endif
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#ifndef _POSIX_SOURCE
-
-/*
- * Include tty ioctl's that aren't just for backwards compatibility
- * with the old tty driver. These ioctl definitions were previously
- * in <sys/ioctl.h>.
- */
-#include <sys/ttycom.h>
-#endif
-
-/*
- * END OF PROTECTED INCLUDE.
- */
-#endif /* !_SYS_TERMIOS_H_ */
-
-#ifndef _POSIX_SOURCE
-#include <sys/ttydefaults.h>
+/* $FreeBSD$ */
+#ifdef __GNUC__
+#warning "this file includes <sys/termios.h> which is deprecated, use <termios.h> instead"
#endif
+#include <termios.h>
Modified: head/sys/sys/tty.h
==============================================================================
--- head/sys/sys/tty.h Sat Nov 28 21:42:39 2009 (r199897)
+++ head/sys/sys/tty.h Sat Nov 28 23:50:48 2009 (r199898)
@@ -38,7 +38,7 @@
#include <sys/mutex.h>
#include <sys/condvar.h>
#include <sys/selinfo.h>
-#include <sys/termios.h>
+#include <sys/_termios.h>
#include <sys/ttycom.h>
#include <sys/ttyqueue.h>
More information about the svn-src-head
mailing list