mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-06 01:21:08 +00:00
General cleanup, use __USE_MISC / __USE_XOPEN not __USE_BSD where appropriate.
This commit is contained in:
Andreas Jaeger
parent
916ea7e833
commit
f255cc1218
@ -25,40 +25,6 @@ typedef unsigned char cc_t;
|
||||
typedef unsigned int speed_t;
|
||||
typedef unsigned int tcflag_t;
|
||||
|
||||
|
||||
#ifdef __USE_BSD
|
||||
|
||||
struct sgttyb
|
||||
{
|
||||
char sg_ispeed;
|
||||
char sg_ospeed;
|
||||
char sg_erase;
|
||||
char sg_kill;
|
||||
int sg_flags; /* SGI special - int, not short */
|
||||
};
|
||||
|
||||
struct tchars
|
||||
{
|
||||
char t_intrc;
|
||||
char t_quitc;
|
||||
char t_startc;
|
||||
char t_stopc;
|
||||
char t_eofc;
|
||||
char t_brkc;
|
||||
};
|
||||
|
||||
struct ltchars
|
||||
{
|
||||
char t_suspc; /* stop process signal */
|
||||
char t_dsuspc; /* delayed stop process signal */
|
||||
char t_rprntc; /* reprint line */
|
||||
char t_flushc; /* flush output (toggles) */
|
||||
char t_werasc; /* word erase */
|
||||
char t_lnextc; /* literal next character */
|
||||
};
|
||||
|
||||
#endif /* defined(__BSD) */
|
||||
|
||||
#define NCCS 32
|
||||
struct termios
|
||||
{
|
||||
@ -66,44 +32,31 @@ struct termios
|
||||
tcflag_t c_oflag; /* output mode flags */
|
||||
tcflag_t c_cflag; /* control mode flags */
|
||||
tcflag_t c_lflag; /* local mode flags */
|
||||
cc_t c_line; /* line discipline */
|
||||
cc_t c_line; /* line discipline */
|
||||
cc_t c_cc[NCCS]; /* control characters */
|
||||
};
|
||||
|
||||
/* c_cc characters */
|
||||
#define VINTR 0 /* Interrupt character [ISIG]. */
|
||||
#define VQUIT 1 /* Quit character [ISIG]. */
|
||||
#define VERASE 2 /* Erase character [ICANON]. */
|
||||
#define VKILL 3 /* Kill-line character [ICANON]. */
|
||||
#define VMIN 4 /* Minimum number of bytes read at once [!ICANON]. */
|
||||
#define VTIME 5 /* Time-out value (tenths of a second) [!ICANON]. */
|
||||
#ifdef __USE_BSD
|
||||
# define VEOL2 6 /* Second EOL character [ICANON]. */
|
||||
/* The next two are guesses ... */
|
||||
# define VSWTC 7 /* ??? */
|
||||
#endif
|
||||
#define VINTR 0 /* Interrupt character [ISIG]. */
|
||||
#define VQUIT 1 /* Quit character [ISIG]. */
|
||||
#define VERASE 2 /* Erase character [ICANON]. */
|
||||
#define VKILL 3 /* Kill-line character [ICANON]. */
|
||||
#define VMIN 4 /* Minimum number of bytes read at once [!ICANON]. */
|
||||
#define VTIME 5 /* Time-out value (tenths of a second) [!ICANON]. */
|
||||
#define VEOL2 6 /* Second EOL character [ICANON]. */
|
||||
#define VSWTC 7
|
||||
#define VSWTCH VSWTC
|
||||
#define VSTART 8 /* Start (X-ON) character [IXON, IXOFF]. */
|
||||
#define VSTOP 9 /* Stop (X-OFF) character [IXON, IXOFF]. */
|
||||
#define VSUSP 10 /* Suspend character [ISIG]. */
|
||||
#if 0
|
||||
/*
|
||||
* VDSUSP is not supported
|
||||
*/
|
||||
#if defined __USE_BSD
|
||||
# define VDSUSP 11 /* Delayed suspend character [ISIG]. */
|
||||
#endif
|
||||
#endif
|
||||
#ifdef __USE_BSD
|
||||
# define VREPRINT 12 /* Reprint-line character [ICANON]. */
|
||||
#endif
|
||||
#ifdef __USE_BSD
|
||||
# define VDISCARD 13 /* Discard character [IEXTEN]. */
|
||||
# define VWERASE 14 /* Word-erase character [ICANON]. */
|
||||
# define VLNEXT 15 /* Literal-next character [IEXTEN]. */
|
||||
#endif
|
||||
#define VEOF 16 /* End-of-file character [ICANON]. */
|
||||
#define VEOL 17 /* End-of-line character [ICANON]. */
|
||||
#define VSTART 8 /* Start (X-ON) character [IXON, IXOFF]. */
|
||||
#define VSTOP 9 /* Stop (X-OFF) character [IXON, IXOFF]. */
|
||||
#define VSUSP 10 /* Suspend character [ISIG]. */
|
||||
/* VDSUSP is not supported on Linux. */
|
||||
/* #define VDSUSP 11 / * Delayed suspend character [ISIG]. */
|
||||
#define VREPRINT 12 /* Reprint-line character [ICANON]. */
|
||||
#define VDISCARD 13 /* Discard character [IEXTEN]. */
|
||||
#define VWERASE 14 /* Word-erase character [ICANON]. */
|
||||
#define VLNEXT 15 /* Literal-next character [IEXTEN]. */
|
||||
#define VEOF 16 /* End-of-file character [ICANON]. */
|
||||
#define VEOL 17 /* End-of-line character [ICANON]. */
|
||||
|
||||
/* c_iflag bits */
|
||||
#define IGNBRK 0000001 /* Ignore break condition. */
|
||||
@ -115,28 +68,22 @@ struct termios
|
||||
#define INLCR 0000100 /* Map NL to CR on input. */
|
||||
#define IGNCR 0000200 /* Ignore CR. */
|
||||
#define ICRNL 0000400 /* Map CR to NL on input. */
|
||||
#ifdef __USE_BSD
|
||||
# define IUCLC 0001000 /* Map upper case to lower case on input. */
|
||||
#endif
|
||||
#define IUCLC 0001000 /* Map upper case to lower case on input. */
|
||||
#define IXON 0002000 /* Enable start/stop output control. */
|
||||
#ifdef __USE_BSD
|
||||
# define IXANY 0004000 /* Any character will restart after stop. */
|
||||
#endif
|
||||
#define IXANY 0004000 /* Any character will restart after stop. */
|
||||
#define IXOFF 0010000 /* Enable start/stop input control. */
|
||||
#ifdef __USE_BSD
|
||||
# define IMAXBEL 0020000 /* Ring bell when input queue is full. */
|
||||
#endif
|
||||
#define IMAXBEL 0020000 /* Ring bell when input queue is full. */
|
||||
|
||||
/* c_oflag bits */
|
||||
#define OPOST 0000001 /* Perform output processing. */
|
||||
#ifdef __USE_BSD
|
||||
# define OLCUC 0000002 /* Map lower case to upper case on output. */
|
||||
# define ONLCR 0000004 /* Map NL to CR-NL on output. */
|
||||
# define OCRNL 0000010
|
||||
# define ONOCR 0000020
|
||||
# define ONLRET 0000040
|
||||
# define OFILL 0000100
|
||||
# define OFDEL 0000200
|
||||
#define OLCUC 0000002 /* Map lower case to upper case on output. */
|
||||
#define ONLCR 0000004 /* Map NL to CR-NL on output. */
|
||||
#define OCRNL 0000010
|
||||
#define ONOCR 0000020
|
||||
#define ONLRET 0000040
|
||||
#define OFILL 0000100
|
||||
#define OFDEL 0000200
|
||||
#if defined __USE_MISC || defined __USE_XOPEN
|
||||
# define NLDLY 0000400
|
||||
# define NL0 0000000
|
||||
# define NL1 0000400
|
||||
@ -150,24 +97,26 @@ struct termios
|
||||
# define TAB1 0004000
|
||||
# define TAB2 0010000
|
||||
# define TAB3 0014000
|
||||
# define XTABS 0014000
|
||||
# define BSDLY 0020000
|
||||
# define BS0 0000000
|
||||
# define BS1 0020000
|
||||
# define VTDLY 0040000
|
||||
# define VT0 0000000
|
||||
# define VT1 0040000
|
||||
# define FFDLY 0100000
|
||||
# define FF0 0000000
|
||||
# define FF1 0100000
|
||||
/*
|
||||
#define PAGEOUT ???
|
||||
#define WRAP ???
|
||||
*/
|
||||
#endif
|
||||
|
||||
#define VTDLY 0040000
|
||||
#define VT0 0000000
|
||||
#define VT1 0040000
|
||||
|
||||
#ifdef __USE_MISC
|
||||
# define XTABS 0014000
|
||||
#endif
|
||||
|
||||
/* c_cflag bit meaning */
|
||||
#define CBAUD 0010017
|
||||
#ifdef __USE_MISC
|
||||
# define CBAUD 0010017
|
||||
#endif
|
||||
#define B0 0000000 /* hang up */
|
||||
#define B50 0000001
|
||||
#define B75 0000002
|
||||
@ -184,8 +133,10 @@ struct termios
|
||||
#define B9600 0000015
|
||||
#define B19200 0000016
|
||||
#define B38400 0000017
|
||||
#define EXTA B19200
|
||||
#define EXTB B38400
|
||||
#ifdef __USE_MISC
|
||||
# define EXTA B19200
|
||||
# define EXTB B38400
|
||||
#endif
|
||||
#define CSIZE 0000060 /* Number of bits per byte (mask). */
|
||||
#define CS5 0000000 /* 5 bits per byte. */
|
||||
#define CS6 0000020 /* 6 bits per byte. */
|
||||
@ -197,24 +148,26 @@ struct termios
|
||||
#define PARODD 0001000 /* Odd parity instead of even. */
|
||||
#define HUPCL 0002000 /* Hang up on last close. */
|
||||
#define CLOCAL 0004000 /* Ignore modem status lines. */
|
||||
#ifdef __USE_BSD
|
||||
#ifdef __USE_MISC
|
||||
# define CBAUDEX 0010000
|
||||
# define B57600 0010001
|
||||
# define B115200 0010002
|
||||
# define B230400 0010003
|
||||
# define B460800 0010004
|
||||
# define B500000 0010005
|
||||
# define B576000 0010006
|
||||
# define B921600 0010007
|
||||
# define B1000000 0010010
|
||||
# define B1152000 0010011
|
||||
# define B1500000 0010012
|
||||
# define B2000000 0010013
|
||||
# define B2500000 0010014
|
||||
# define B3000000 0010015
|
||||
# define B3500000 0010016
|
||||
# define B4000000 0010017
|
||||
# define __MAX_BAUD B4000000
|
||||
#endif
|
||||
#define B57600 0010001
|
||||
#define B115200 0010002
|
||||
#define B230400 0010003
|
||||
#define B460800 0010004
|
||||
#define B500000 0010005
|
||||
#define B576000 0010006
|
||||
#define B921600 0010007
|
||||
#define B1000000 0010010
|
||||
#define B1152000 0010011
|
||||
#define B1500000 0010012
|
||||
#define B2000000 0010013
|
||||
#define B2500000 0010014
|
||||
#define B3000000 0010015
|
||||
#define B3500000 0010016
|
||||
#define B4000000 0010017
|
||||
#define __MAX_BAUD B4000000
|
||||
#ifdef __USE_MISC
|
||||
# define CIBAUD 002003600000 /* input baud rate (not used) */
|
||||
# define CRTSCTS 020000000000 /* flow control */
|
||||
#endif
|
||||
@ -222,20 +175,20 @@ struct termios
|
||||
/* c_lflag bits */
|
||||
#define ISIG 0000001 /* Enable signals. */
|
||||
#define ICANON 0000002 /* Do erase and kill processing. */
|
||||
#define XCASE 0000004
|
||||
#if defined __USE_MISC || defined __USE_XOPEN
|
||||
# define XCASE 0000004
|
||||
#endif
|
||||
#define ECHO 0000010 /* Enable echo. */
|
||||
#define ECHOE 0000020 /* Visual erase for ERASE. */
|
||||
#define ECHOK 0000040 /* Echo NL after KILL. */
|
||||
#define ECHONL 0000100 /* Echo NL even if ECHO is off. */
|
||||
#define NOFLSH 0000200 /* Disable flush after interrupt. */
|
||||
#define IEXTEN 0000400 /* Enable DISCARD and LNEXT. */
|
||||
#ifdef __USE_BSD
|
||||
#ifdef __USE_MISC
|
||||
# define ECHOCTL 0001000 /* Echo control characters as ^X. */
|
||||
# define ECHOPRT 0002000 /* Hardcopy visual erase. */
|
||||
# define ECHOKE 0004000 /* Visual erase for KILL. */
|
||||
#endif
|
||||
#define FLUSHO 0020000
|
||||
#ifdef __USE_BSD
|
||||
# define FLUSHO 0020000
|
||||
# define PENDIN 0040000 /* Retype pending input (state). */
|
||||
#endif
|
||||
#define TOSTOP 0100000 /* Send SIGTTOU for background output. */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user