On Sun, Feb 06, 2022 at 07:48:53AM -0800, Walt Drummond wrote:
> Add definitions for the VSTATUS control character, and the NOKERNINFO
> local control flag in the termios struct, and add an ioctl number for
> the ioctl TIOCSTAT. Also add a default VSTATUS character (Ctrl-T)
> default valuses in termios.c_cc. Do this for all architectures.
>
> Signed-off-by: Walt Drummond <walt@xxxxxxxxxxx>
> ---
> arch/alpha/include/asm/termios.h | 4 ++--
> arch/alpha/include/uapi/asm/ioctls.h | 1 +
> arch/alpha/include/uapi/asm/termbits.h | 2 ++
> arch/ia64/include/asm/termios.h | 4 ++--
> arch/ia64/include/uapi/asm/termbits.h | 2 ++
> arch/mips/include/asm/termios.h | 4 ++--
> arch/mips/include/uapi/asm/ioctls.h | 1 +
> arch/mips/include/uapi/asm/termbits.h | 2 ++
> arch/parisc/include/asm/termios.h | 4 ++--
> arch/parisc/include/uapi/asm/ioctls.h | 1 +
> arch/parisc/include/uapi/asm/termbits.h | 2 ++
> arch/powerpc/include/asm/termios.h | 4 ++--
> arch/powerpc/include/uapi/asm/ioctls.h | 2 ++
> arch/powerpc/include/uapi/asm/termbits.h | 2 ++
> arch/s390/include/asm/termios.h | 4 ++--
> arch/sh/include/uapi/asm/ioctls.h | 1 +
> arch/sparc/include/uapi/asm/ioctls.h | 1 +
> arch/sparc/include/uapi/asm/termbits.h | 2 ++
> arch/xtensa/include/uapi/asm/ioctls.h | 1 +
> include/asm-generic/termios.h | 4 ++--
> include/uapi/asm-generic/ioctls.h | 1 +
> include/uapi/asm-generic/termbits.h | 2 ++
> 22 files changed, 37 insertions(+), 14 deletions(-)
>
> diff --git a/arch/alpha/include/asm/termios.h b/arch/alpha/include/asm/termios.h
> index b7c77bb1bfd2..d28ddc649286 100644
> --- a/arch/alpha/include/asm/termios.h
> +++ b/arch/alpha/include/asm/termios.h
> @@ -8,9 +8,9 @@
> werase=^W kill=^U reprint=^R sxtc=\0
> intr=^C quit=^\ susp=^Z <OSF/1 VDSUSP>
> start=^Q stop=^S lnext=^V discard=^U
> - vmin=\1 vtime=\0
> + vmin=\1 vtime=\0 status=^T
> */
> -#define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\025\001\000"
> +#define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\025\001\000\024"
>
> /*
> * Translate a "termio" structure into a "termios". Ugh.
> diff --git a/arch/alpha/include/uapi/asm/ioctls.h b/arch/alpha/include/uapi/asm/ioctls.h
> index 971311605288..70fdeab2b5f2 100644
> --- a/arch/alpha/include/uapi/asm/ioctls.h
> +++ b/arch/alpha/include/uapi/asm/ioctls.h
> @@ -124,5 +124,6 @@
>
> #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
> #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
> +#define TIOCSTAT _IO('T', 0x5E) /* display process group stats on tty */
>
> #endif /* _ASM_ALPHA_IOCTLS_H */
> diff --git a/arch/alpha/include/uapi/asm/termbits.h b/arch/alpha/include/uapi/asm/termbits.h
> index 4575ba34a0ea..9a1b9aa92d29 100644
> --- a/arch/alpha/include/uapi/asm/termbits.h
> +++ b/arch/alpha/include/uapi/asm/termbits.h
> @@ -70,6 +70,7 @@ struct ktermios {
> #define VDISCARD 15
> #define VMIN 16
> #define VTIME 17
> +#define VSTATUS 18
>
> /* c_iflag bits */
> #define IGNBRK 0000001
> @@ -203,6 +204,7 @@ struct ktermios {
> #define PENDIN 0x20000000
> #define IEXTEN 0x00000400
> #define EXTPROC 0x10000000
> +#define NOKERNINFO 0x40000000
Here, and elsewhere, you seem to mix tabs and spaces. Please use what
is in the original file (tabs here.)
> /* Values for the ACTION argument to `tcflow'. */
> #define TCOOFF 0
> diff --git a/arch/ia64/include/asm/termios.h b/arch/ia64/include/asm/termios.h
> index 589c026444cc..40e83f9b6ead 100644
> --- a/arch/ia64/include/asm/termios.h
> +++ b/arch/ia64/include/asm/termios.h
> @@ -15,9 +15,9 @@
> eof=^D vtime=\0 vmin=\1 sxtc=\0
> start=^Q stop=^S susp=^Z eol=\0
> reprint=^R discard=^U werase=^W lnext=^V
> - eol2=\0
> + eol2=\0 status=^T
Same here. And for the other files in this patch. Let's keep them
unified please.
thanks,
greg k-h
