Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[S390] use generic termbits.h header file

A compare shows that arch/s390/include/asm/termbits.h is the same as
include/asm-generic.h. This patch lets arch/s390/include/asm/termbits.h
include the generic header.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Christian Borntraeger and committed by
Martin Schwidefsky
df27d7ba c20c89a6

+3 -203
+3 -203
arch/s390/include/asm/termbits.h
··· 1 - /* 2 - * include/asm-s390/termbits.h 3 - * 4 - * S390 version 5 - * 6 - * Derived from "include/asm-i386/termbits.h" 7 - */ 1 + #ifndef _ASM_S390_TERMBITS_H 2 + #define _ASM_S390_TERMBITS_H 8 3 9 - #ifndef __ARCH_S390_TERMBITS_H__ 10 - #define __ARCH_S390_TERMBITS_H__ 11 - 12 - #include <linux/posix_types.h> 13 - 14 - typedef unsigned char cc_t; 15 - typedef unsigned int speed_t; 16 - typedef unsigned int tcflag_t; 17 - 18 - #define NCCS 19 19 - struct termios { 20 - tcflag_t c_iflag; /* input mode flags */ 21 - tcflag_t c_oflag; /* output mode flags */ 22 - tcflag_t c_cflag; /* control mode flags */ 23 - tcflag_t c_lflag; /* local mode flags */ 24 - cc_t c_line; /* line discipline */ 25 - cc_t c_cc[NCCS]; /* control characters */ 26 - }; 27 - 28 - struct termios2 { 29 - tcflag_t c_iflag; /* input mode flags */ 30 - tcflag_t c_oflag; /* output mode flags */ 31 - tcflag_t c_cflag; /* control mode flags */ 32 - tcflag_t c_lflag; /* local mode flags */ 33 - cc_t c_line; /* line discipline */ 34 - cc_t c_cc[NCCS]; /* control characters */ 35 - speed_t c_ispeed; /* input speed */ 36 - speed_t c_ospeed; /* output speed */ 37 - }; 38 - 39 - struct ktermios { 40 - tcflag_t c_iflag; /* input mode flags */ 41 - tcflag_t c_oflag; /* output mode flags */ 42 - tcflag_t c_cflag; /* control mode flags */ 43 - tcflag_t c_lflag; /* local mode flags */ 44 - cc_t c_line; /* line discipline */ 45 - cc_t c_cc[NCCS]; /* control characters */ 46 - speed_t c_ispeed; /* input speed */ 47 - speed_t c_ospeed; /* output speed */ 48 - }; 49 - 50 - /* c_cc characters */ 51 - #define VINTR 0 52 - #define VQUIT 1 53 - #define VERASE 2 54 - #define VKILL 3 55 - #define VEOF 4 56 - #define VTIME 5 57 - #define VMIN 6 58 - #define VSWTC 7 59 - #define VSTART 8 60 - #define VSTOP 9 61 - #define VSUSP 10 62 - #define VEOL 11 63 - #define VREPRINT 12 64 - #define VDISCARD 13 65 - #define VWERASE 14 66 - #define VLNEXT 15 67 - #define VEOL2 16 68 - 69 - /* c_iflag bits */ 70 - #define IGNBRK 0000001 71 - #define BRKINT 0000002 72 - #define IGNPAR 0000004 73 - #define PARMRK 0000010 74 - #define INPCK 0000020 75 - #define ISTRIP 0000040 76 - #define INLCR 0000100 77 - #define IGNCR 0000200 78 - #define ICRNL 0000400 79 - #define IUCLC 0001000 80 - #define IXON 0002000 81 - #define IXANY 0004000 82 - #define IXOFF 0010000 83 - #define IMAXBEL 0020000 84 - #define IUTF8 0040000 85 - 86 - /* c_oflag bits */ 87 - #define OPOST 0000001 88 - #define OLCUC 0000002 89 - #define ONLCR 0000004 90 - #define OCRNL 0000010 91 - #define ONOCR 0000020 92 - #define ONLRET 0000040 93 - #define OFILL 0000100 94 - #define OFDEL 0000200 95 - #define NLDLY 0000400 96 - #define NL0 0000000 97 - #define NL1 0000400 98 - #define CRDLY 0003000 99 - #define CR0 0000000 100 - #define CR1 0001000 101 - #define CR2 0002000 102 - #define CR3 0003000 103 - #define TABDLY 0014000 104 - #define TAB0 0000000 105 - #define TAB1 0004000 106 - #define TAB2 0010000 107 - #define TAB3 0014000 108 - #define XTABS 0014000 109 - #define BSDLY 0020000 110 - #define BS0 0000000 111 - #define BS1 0020000 112 - #define VTDLY 0040000 113 - #define VT0 0000000 114 - #define VT1 0040000 115 - #define FFDLY 0100000 116 - #define FF0 0000000 117 - #define FF1 0100000 118 - 119 - /* c_cflag bit meaning */ 120 - #define CBAUD 0010017 121 - #define B0 0000000 /* hang up */ 122 - #define B50 0000001 123 - #define B75 0000002 124 - #define B110 0000003 125 - #define B134 0000004 126 - #define B150 0000005 127 - #define B200 0000006 128 - #define B300 0000007 129 - #define B600 0000010 130 - #define B1200 0000011 131 - #define B1800 0000012 132 - #define B2400 0000013 133 - #define B4800 0000014 134 - #define B9600 0000015 135 - #define B19200 0000016 136 - #define B38400 0000017 137 - #define EXTA B19200 138 - #define EXTB B38400 139 - #define CSIZE 0000060 140 - #define CS5 0000000 141 - #define CS6 0000020 142 - #define CS7 0000040 143 - #define CS8 0000060 144 - #define CSTOPB 0000100 145 - #define CREAD 0000200 146 - #define PARENB 0000400 147 - #define PARODD 0001000 148 - #define HUPCL 0002000 149 - #define CLOCAL 0004000 150 - #define CBAUDEX 0010000 151 - #define BOTHER 0010000 152 - #define B57600 0010001 153 - #define B115200 0010002 154 - #define B230400 0010003 155 - #define B460800 0010004 156 - #define B500000 0010005 157 - #define B576000 0010006 158 - #define B921600 0010007 159 - #define B1000000 0010010 160 - #define B1152000 0010011 161 - #define B1500000 0010012 162 - #define B2000000 0010013 163 - #define B2500000 0010014 164 - #define B3000000 0010015 165 - #define B3500000 0010016 166 - #define B4000000 0010017 167 - #define CIBAUD 002003600000 /* input baud rate */ 168 - #define CMSPAR 010000000000 /* mark or space (stick) parity */ 169 - #define CRTSCTS 020000000000 /* flow control */ 170 - 171 - #define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ 172 - 173 - /* c_lflag bits */ 174 - #define ISIG 0000001 175 - #define ICANON 0000002 176 - #define XCASE 0000004 177 - #define ECHO 0000010 178 - #define ECHOE 0000020 179 - #define ECHOK 0000040 180 - #define ECHONL 0000100 181 - #define NOFLSH 0000200 182 - #define TOSTOP 0000400 183 - #define ECHOCTL 0001000 184 - #define ECHOPRT 0002000 185 - #define ECHOKE 0004000 186 - #define FLUSHO 0010000 187 - #define PENDIN 0040000 188 - #define IEXTEN 0100000 189 - 190 - /* tcflow() and TCXONC use these */ 191 - #define TCOOFF 0 192 - #define TCOON 1 193 - #define TCIOFF 2 194 - #define TCION 3 195 - 196 - /* tcflush() and TCFLSH use these */ 197 - #define TCIFLUSH 0 198 - #define TCOFLUSH 1 199 - #define TCIOFLUSH 2 200 - 201 - /* tcsetattr uses these */ 202 - #define TCSANOW 0 203 - #define TCSADRAIN 1 204 - #define TCSAFLUSH 2 4 + #include <asm-generic/termbits.h> 205 5 206 6 #endif