Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
make generic INIT_C_CC a bit more generic
turn it into an array initializer; then alpha, mips and powerpc
variants fold into it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/YxDm7M6M91gC2RPL@ZenIV
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
authored by
Al Viro
and committed by
Greg Kroah-Hartman
d04f9915
38fc315a
+14
-21
-8
arch/alpha/include/asm/termios.h
-8
arch/alpha/include/asm/termios.h
···
5
5
#include <linux/uaccess.h>
6
6
#include <uapi/asm/termios.h>
7
7
8
-
/* eof=^D eol=\0 eol2=\0 erase=del
9
-
werase=^W kill=^U reprint=^R sxtc=\0
10
-
intr=^C quit=^\ susp=^Z <OSF/1 VDSUSP>
11
-
start=^Q stop=^S lnext=^V discard=^O
12
-
vmin=\1 vtime=\0
13
-
*/
14
-
#define INIT_C_CC "\004\000\000\177\027\025\022\000\003\034\032\000\021\023\026\017\001\000"
15
-
16
8
#endif /* _ALPHA_TERMIOS_H */
-9
arch/mips/include/asm/termios.h
-9
arch/mips/include/asm/termios.h
···
12
12
#include <linux/uaccess.h>
13
13
#include <uapi/asm/termios.h>
14
14
15
-
/*
16
-
* intr=^C quit=^\ erase=del kill=^U
17
-
* vmin=\1 vtime=\0 eol2=\0 swtc=\0
18
-
* start=^Q stop=^S susp=^Z vdsusp=
19
-
* reprint=^R discard=^O werase=^W lnext=^V
20
-
* eof=^D eol=\0
21
-
*/
22
-
#define INIT_C_CC "\003\034\177\025\1\0\0\0\021\023\032\0\022\017\027\026\004\0"
23
-
24
15
#endif /* _ASM_TERMIOS_H */
-3
arch/powerpc/include/asm/termios.h
-3
arch/powerpc/include/asm/termios.h
+14
-1
include/linux/termios_internal.h
+14
-1
include/linux/termios_internal.h
···
12
12
reprint=^R discard=^O werase=^W lnext=^V
13
13
eol2=\0
14
14
*/
15
-
#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
15
+
#define INIT_C_CC { \
16
+
[VINTR] = 'C'-0x40, \
17
+
[VQUIT] = '\\'-0x40, \
18
+
[VERASE] = '\177', \
19
+
[VKILL] = 'U'-0x40, \
20
+
[VEOF] = 'D'-0x40, \
21
+
[VSTART] = 'Q'-0x40, \
22
+
[VSTOP] = 'S'-0x40, \
23
+
[VSUSP] = 'Z'-0x40, \
24
+
[VREPRINT] = 'R'-0x40, \
25
+
[VDISCARD] = 'O'-0x40, \
26
+
[VWERASE] = 'W'-0x40, \
27
+
[VLNEXT] = 'V'-0x40, \
28
+
[VMIN] = 1 }
16
29
#endif
17
30
18
31
int user_termio_to_kernel_termios(struct ktermios *, struct termio __user *);