Commit c9b34088 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

termbits.h: Align lines & format 



- Align c_cc defines.
- Remove extra newlines.
- Realign & adjust number of leading zeros.
- Reorder c_cflag defines to ascending order
- Make comment ending shorted (=remove period and one extra space from
  the comments in mips).

Co-developed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220509093446.6677-3-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b46ac44

arch/alpha/include/uapi/asm/termbits.h

+62 −68
Original line number Diff line number Diff line
@@ -72,41 +72,39 @@ struct ktermios { 
#define VTIME		17



/* c_iflag bits */

#define IXON	0x00200

#define IXOFF	0x00400

#define IUCLC	0x01000

#define IMAXBEL	0x02000

#define IUTF8	0x04000

#define IXON	0x0200

#define IXOFF	0x0400

#define IUCLC	0x1000

#define IMAXBEL	0x2000

#define IUTF8	0x4000



/* c_oflag bits */

#define ONLCR	0x00002

#define OLCUC	0x00004





#define NLDLY	0x000300

#define   NL0	0x000000

#define   NL1	0x000100

#define   NL2	0x000200

#define   NL3	0x000300

#define TABDLY	0x000c00

#define   TAB0	0x000000

#define   TAB1	0x000400

#define   TAB2	0x000800

#define   TAB3	0x000c00

#define CRDLY	0x003000

#define   CR0	0x000000

#define   CR1	0x001000

#define   CR2	0x002000

#define   CR3	0x003000

#define FFDLY	0x004000

#define   FF0	0x000000

#define   FF1	0x004000

#define BSDLY	0x008000

#define   BS0	0x000000

#define   BS1	0x008000

#define VTDLY	0x010000

#define   VT0	0x000000

#define   VT1	0x010000

#define NLDLY	0x00300

#define   NL0	0x00000

#define   NL1	0x00100

#define   NL2	0x00200

#define   NL3	0x00300

#define TABDLY	0x00c00

#define   TAB0	0x00000

#define   TAB1	0x00400

#define   TAB2	0x00800

#define   TAB3	0x00c00

#define CRDLY	0x03000

#define   CR0	0x00000

#define   CR1	0x01000

#define   CR2	0x02000

#define   CR3	0x03000

#define FFDLY	0x04000

#define   FF0	0x00000

#define   FF1	0x04000

#define BSDLY	0x08000

#define   BS0	0x00000

#define   BS1	0x08000

#define VTDLY	0x10000

#define   VT0	0x00000

#define   VT1	0x10000

/*

 * Should be equivalent to TAB3, see description of TAB3 in

 * POSIX.1-2008, Ch. 11.2.3 "Output Modes"
@@ -116,6 +114,7 @@ struct ktermios { 
/* c_cflag bit meaning */

#define CBAUD		0x0000001f

#define CBAUDEX		0x00000000

#define BOTHER		0x0000001f

#define     B57600	0x00000010

#define    B115200	0x00000011

#define    B230400	0x00000012
@@ -131,23 +130,18 @@ struct ktermios { 
#define   B3000000	0x0000001c

#define   B3500000	0x0000001d

#define   B4000000	0x0000001e

#define BOTHER		0x0000001f



#define CSIZE		0x00000300

#define   CS5		0x00000000

#define   CS6		0x00000100

#define   CS7		0x00000200

#define   CS8		0x00000300



#define CSTOPB		0x00000400

#define CREAD		0x00000800

#define PARENB		0x00001000

#define PARODD		0x00002000

#define HUPCL		0x00004000



#define CLOCAL		0x00008000



#define CIBAUD		0x1f0000

#define CIBAUD		0x001f0000



/* c_lflag bits */

#define ISIG	0x00000080

arch/mips/include/uapi/asm/termbits.h

+78 −78
Original line number Diff line number Diff line
@@ -54,41 +54,41 @@ struct ktermios { 
};



/* 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].  */

#define VEOL2		 6		/* Second EOL character [ICANON].  */

#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].  */

#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

 */

#define VDSUSP		11		/* Delayed suspend character [ISIG].  */

#define VDSUSP		11		/* Delayed suspend character [ISIG] */

#endif

#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].  */

#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 IUCLC	0x00200		/* Map upper case to lower case on input.  */

#define IXON	0x00400		/* Enable start/stop output control.  */

#define IXOFF	0x01000		/* Enable start/stop input control.  */

#define IMAXBEL	0x02000		/* Ring bell when input queue is full.	*/

#define IUTF8	0x04000		/* Input is UTF-8 */

#define IUCLC	0x0200		/* Map upper case to lower case on input */

#define IXON	0x0400		/* Enable start/stop output control */

#define IXOFF	0x1000		/* Enable start/stop input control */

#define IMAXBEL	0x2000		/* Ring bell when input queue is full */

#define IUTF8	0x4000		/* Input is UTF-8 */



/* c_oflag bits */

#define OLCUC	0x00002		/* Map lower case to upper case on output.  */

#define ONLCR	0x00004		/* Map NL to CR-NL on output.  */

#define OLCUC	0x00002		/* Map lower case to upper case on output */

#define ONLCR	0x00004		/* Map NL to CR-NL on output */

#define NLDLY	0x00100

#define   NL0	0x00000

#define   NL1	0x00100
@@ -150,21 +150,21 @@ struct ktermios { 
#define CIBAUD		0x100f0000	/* input baud rate */



/* c_lflag bits */

#define ISIG	0x00001		/* Enable signals.  */

#define ICANON	0x00002		/* Do erase and kill processing.  */

#define ISIG	0x00001		/* Enable signals */

#define ICANON	0x00002		/* Do erase and kill processing */

#define XCASE	0x00004

#define ECHO	0x00008		/* Enable echo.	 */

#define ECHOE	0x00010		/* Visual erase for ERASE.  */

#define ECHOK	0x00020		/* Echo NL after KILL.	*/

#define ECHONL	0x00040		/* Echo NL even if ECHO is off.	 */

#define NOFLSH	0x00080		/* Disable flush after interrupt.  */

#define IEXTEN	0x00100		/* Enable DISCARD and LNEXT.  */

#define ECHOCTL	0x00200		/* Echo control characters as ^X.  */

#define ECHOPRT	0x00400		/* Hardcopy visual erase.  */

#define ECHOKE	0x00800		/* Visual erase for KILL.  */

#define ECHO	0x00008		/* Enable echo */

#define ECHOE	0x00010		/* Visual erase for ERASE */

#define ECHOK	0x00020		/* Echo NL after KILL */

#define ECHONL	0x00040		/* Echo NL even if ECHO is off */

#define NOFLSH	0x00080		/* Disable flush after interrupt */

#define IEXTEN	0x00100		/* Enable DISCARD and LNEXT */

#define ECHOCTL	0x00200		/* Echo control characters as ^X */

#define ECHOPRT	0x00400		/* Hardcopy visual erase */

#define ECHOKE	0x00800		/* Visual erase for KILL */

#define FLUSHO	0x02000

#define PENDIN	0x04000		/* Retype pending input (state).  */

#define TOSTOP	0x08000		/* Send SIGTTOU for background output.	*/

#define PENDIN	0x04000		/* Retype pending input (state) */

#define TOSTOP	0x08000		/* Send SIGTTOU for background output */

#define ITOSTOP	TOSTOP

#define EXTPROC	0x10000		/* External processing on pty */
@@ -172,8 +172,8 @@ struct ktermios { 
#define TIOCSER_TEMT	0x01	/* Transmitter physically empty */



/* tcsetattr uses these */

#define TCSANOW		TCSETS	/* Change immediately.	*/

#define TCSADRAIN	TCSETSW /* Change when pending output is written.  */

#define TCSAFLUSH	TCSETSF /* Flush pending input before changing.	 */

#define TCSANOW		TCSETS	/* Change immediately */

#define TCSADRAIN	TCSETSW /* Change when pending output is written */

#define TCSAFLUSH	TCSETSF /* Flush pending input before changing */



#endif /* _ASM_TERMBITS_H */

arch/parisc/include/uapi/asm/termbits.h

+38 −39
Original line number Diff line number Diff line
@@ -59,13 +59,12 @@ struct ktermios { 
#define VLNEXT		15

#define VEOL2		16





/* c_iflag bits */

#define IUCLC	0x00200

#define IXON	0x00400

#define IXOFF	0x01000

#define IMAXBEL	0x04000

#define IUTF8	0x08000

#define IUCLC	0x0200

#define IXON	0x0400

#define IXOFF	0x1000

#define IMAXBEL	0x4000

#define IUTF8	0x8000



/* c_oflag bits */

#define OLCUC	0x00002

arch/powerpc/include/uapi/asm/termbits.h

+47 −53
Original line number Diff line number Diff line
@@ -64,46 +64,45 @@ struct ktermios { 
#define VDISCARD	16



/* c_iflag bits */

#define IXON	0x00200

#define IXOFF	0x00400

#define IUCLC	0x01000

#define IMAXBEL	0x02000

#define	IUTF8	0x04000

#define IXON	0x0200

#define IXOFF	0x0400

#define IUCLC	0x1000

#define IMAXBEL	0x2000

#define IUTF8	0x4000



/* c_oflag bits */

#define ONLCR	0x00002

#define OLCUC	0x00004





#define NLDLY	0x000300

#define   NL0	0x000000

#define   NL1	0x000100

#define   NL2	0x000200

#define   NL3	0x000300

#define TABDLY	0x000c00

#define   TAB0	0x000000

#define   TAB1	0x000400

#define   TAB2	0x000800

#define   TAB3	0x000c00

#define   XTABS	0x000c00	/* required by POSIX to == TAB3 */

#define CRDLY	0x003000

#define   CR0	0x000000

#define   CR1	0x001000

#define   CR2	0x002000

#define   CR3	0x003000

#define FFDLY	0x004000

#define   FF0	0x000000

#define   FF1	0x004000

#define BSDLY	0x008000

#define   BS0	0x000000

#define   BS1	0x008000

#define VTDLY	0x010000

#define   VT0	0x000000

#define   VT1	0x010000

#define NLDLY	0x00300

#define   NL0	0x00000

#define   NL1	0x00100

#define   NL2	0x00200

#define   NL3	0x00300

#define TABDLY	0x00c00

#define   TAB0	0x00000

#define   TAB1	0x00400

#define   TAB2	0x00800

#define   TAB3	0x00c00

#define   XTABS	0x00c00		/* required by POSIX to == TAB3 */

#define CRDLY	0x03000

#define   CR0	0x00000

#define   CR1	0x01000

#define   CR2	0x02000

#define   CR3	0x03000

#define FFDLY	0x04000

#define   FF0	0x00000

#define   FF1	0x04000

#define BSDLY	0x08000

#define   BS0	0x00000

#define   BS1	0x08000

#define VTDLY	0x10000

#define   VT0	0x00000

#define   VT1	0x10000



/* c_cflag bit meaning */

#define CBAUD		0x000000ff

#define CBAUDEX		0x00000000

#define BOTHER		0x0000001f

#define    B57600	0x00000010

#define   B115200	0x00000011

#define   B230400	0x00000012
@@ -119,23 +118,18 @@ struct ktermios { 
#define  B3000000	0x0000001c

#define  B3500000	0x0000001d

#define  B4000000	0x0000001e

#define   BOTHER	0x0000001f



#define CIBAUD		0x00ff0000



#define CSIZE		0x00000300

#define   CS5		0x00000000

#define   CS6		0x00000100

#define   CS7		0x00000200

#define   CS8		0x00000300



#define CSTOPB		0x00000400

#define CREAD		0x00000800

#define PARENB		0x00001000

#define PARODD		0x00002000

#define HUPCL		0x00004000



#define CLOCAL		0x00008000

#define CIBAUD		0x00ff0000



/* c_lflag bits */

#define ISIG	0x00000080

arch/sparc/include/uapi/asm/termbits.h

+83 −85
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ struct ktermios { 
#define VSTART    8

#define VSTOP     9







#define VSUSP    10

#define VDSUSP   11		/* SunOS POSIX nicety I do believe... */

#define VREPRINT 12
@@ -89,40 +87,40 @@ struct ktermios { 
#endif



/* c_iflag bits */

#define IUCLC	0x00000200

#define IXON	0x00000400

#define IXOFF	0x00001000

#define IMAXBEL	0x00002000

#define IUTF8   0x00004000

#define IUCLC	0x0200

#define IXON	0x0400

#define IXOFF	0x1000

#define IMAXBEL	0x2000

#define IUTF8   0x4000



/* c_oflag bits */

#define OLCUC	0x00000002

#define ONLCR	0x00000004

#define NLDLY	0x00000100

#define   NL0	0x00000000

#define   NL1	0x00000100

#define CRDLY	0x00000600

#define   CR0	0x00000000

#define   CR1	0x00000200

#define   CR2	0x00000400

#define   CR3	0x00000600

#define TABDLY	0x00001800

#define   TAB0	0x00000000

#define   TAB1	0x00000800

#define   TAB2	0x00001000

#define   TAB3	0x00001800

#define   XTABS	0x00001800

#define BSDLY	0x00002000

#define   BS0	0x00000000

#define   BS1	0x00002000

#define VTDLY	0x00004000

#define   VT0	0x00000000

#define   VT1	0x00004000

#define FFDLY	0x00008000

#define   FF0	0x00000000

#define   FF1	0x00008000

#define PAGEOUT 0x00010000  /* SUNOS specific */

#define WRAP    0x00020000  /* SUNOS specific */

#define OLCUC	0x00002

#define ONLCR	0x00004

#define NLDLY	0x00100

#define   NL0	0x00000

#define   NL1	0x00100

#define CRDLY	0x00600

#define   CR0	0x00000

#define   CR1	0x00200

#define   CR2	0x00400

#define   CR3	0x00600

#define TABDLY	0x01800

#define   TAB0	0x00000

#define   TAB1	0x00800

#define   TAB2	0x01000

#define   TAB3	0x01800

#define   XTABS	0x01800

#define BSDLY	0x02000

#define   BS0	0x00000

#define   BS1	0x02000

#define VTDLY	0x04000

#define   VT0	0x00000

#define   VT1	0x04000

#define FFDLY	0x08000

#define   FF0	0x00000

#define   FF1	0x08000

#define PAGEOUT 0x10000			/* SUNOS specific */

#define WRAP    0x20000			/* SUNOS specific */



/* c_cflag bit meaning */

#define CBAUD		0x0000100f