Commit f05d35d26da3bcec318e23b943223f83d5e90add
1 parent
b9a02bed
Sync termbits.h with current Linux kernel.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3215 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
7 changed files
with
45 additions
and
11 deletions
linux-user/arm/termbits.h
| @@ -27,6 +27,7 @@ struct target_termios { | @@ -27,6 +27,7 @@ struct target_termios { | ||
| 27 | #define TARGET_IXANY 0004000 | 27 | #define TARGET_IXANY 0004000 |
| 28 | #define TARGET_IXOFF 0010000 | 28 | #define TARGET_IXOFF 0010000 |
| 29 | #define TARGET_IMAXBEL 0020000 | 29 | #define TARGET_IMAXBEL 0020000 |
| 30 | +#define TARGET_IUTF8 0040000 | ||
| 30 | 31 | ||
| 31 | /* c_oflag bits */ | 32 | /* c_oflag bits */ |
| 32 | #define TARGET_OPOST 0000001 | 33 | #define TARGET_OPOST 0000001 |
| @@ -98,7 +99,8 @@ struct target_termios { | @@ -98,7 +99,8 @@ struct target_termios { | ||
| 98 | #define TARGET_B230400 0010003 | 99 | #define TARGET_B230400 0010003 |
| 99 | #define TARGET_B460800 0010004 | 100 | #define TARGET_B460800 0010004 |
| 100 | #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ | 101 | #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ |
| 101 | -#define TARGET_CRTSCTS 020000000000 /* flow control */ | 102 | +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ |
| 103 | +#define TARGET_CRTSCTS 020000000000 /* flow control */ | ||
| 102 | 104 | ||
| 103 | /* c_lflag bits */ | 105 | /* c_lflag bits */ |
| 104 | #define TARGET_ISIG 0000001 | 106 | #define TARGET_ISIG 0000001 |
linux-user/i386/termbits.h
| @@ -26,6 +26,7 @@ struct target_termios { | @@ -26,6 +26,7 @@ struct target_termios { | ||
| 26 | #define TARGET_IXANY 0004000 | 26 | #define TARGET_IXANY 0004000 |
| 27 | #define TARGET_IXOFF 0010000 | 27 | #define TARGET_IXOFF 0010000 |
| 28 | #define TARGET_IMAXBEL 0020000 | 28 | #define TARGET_IMAXBEL 0020000 |
| 29 | +#define TARGET_IUTF8 0040000 | ||
| 29 | 30 | ||
| 30 | /* c_oflag bits */ | 31 | /* c_oflag bits */ |
| 31 | #define TARGET_OPOST 0000001 | 32 | #define TARGET_OPOST 0000001 |
| @@ -96,8 +97,20 @@ struct target_termios { | @@ -96,8 +97,20 @@ struct target_termios { | ||
| 96 | #define TARGET_B115200 0010002 | 97 | #define TARGET_B115200 0010002 |
| 97 | #define TARGET_B230400 0010003 | 98 | #define TARGET_B230400 0010003 |
| 98 | #define TARGET_B460800 0010004 | 99 | #define TARGET_B460800 0010004 |
| 100 | +#define TARGET_B500000 0010005 | ||
| 101 | +#define TARGET_B576000 0010006 | ||
| 102 | +#define TARGET_B921600 0010007 | ||
| 103 | +#define TARGET_B1000000 0010010 | ||
| 104 | +#define TARGET_B1152000 0010011 | ||
| 105 | +#define TARGET_B1500000 0010012 | ||
| 106 | +#define TARGET_B2000000 0010013 | ||
| 107 | +#define TARGET_B2500000 0010014 | ||
| 108 | +#define TARGET_B3000000 0010015 | ||
| 109 | +#define TARGET_B3500000 0010016 | ||
| 110 | +#define TARGET_B4000000 0010017 | ||
| 99 | #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ | 111 | #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ |
| 100 | -#define TARGET_CRTSCTS 020000000000 /* flow control */ | 112 | +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ |
| 113 | +#define TARGET_CRTSCTS 020000000000 /* flow control */ | ||
| 101 | 114 | ||
| 102 | /* c_lflag bits */ | 115 | /* c_lflag bits */ |
| 103 | #define TARGET_ISIG 0000001 | 116 | #define TARGET_ISIG 0000001 |
linux-user/m68k/termbits.h
| @@ -27,6 +27,7 @@ struct target_termios { | @@ -27,6 +27,7 @@ struct target_termios { | ||
| 27 | #define TARGET_IXANY 0004000 | 27 | #define TARGET_IXANY 0004000 |
| 28 | #define TARGET_IXOFF 0010000 | 28 | #define TARGET_IXOFF 0010000 |
| 29 | #define TARGET_IMAXBEL 0020000 | 29 | #define TARGET_IMAXBEL 0020000 |
| 30 | +#define TARGET_IUTF8 0040000 | ||
| 30 | 31 | ||
| 31 | /* c_oflag bits */ | 32 | /* c_oflag bits */ |
| 32 | #define TARGET_OPOST 0000001 | 33 | #define TARGET_OPOST 0000001 |
| @@ -97,8 +98,20 @@ struct target_termios { | @@ -97,8 +98,20 @@ struct target_termios { | ||
| 97 | #define TARGET_B115200 0010002 | 98 | #define TARGET_B115200 0010002 |
| 98 | #define TARGET_B230400 0010003 | 99 | #define TARGET_B230400 0010003 |
| 99 | #define TARGET_B460800 0010004 | 100 | #define TARGET_B460800 0010004 |
| 101 | +#define TARGET_B500000 0010005 | ||
| 102 | +#define TARGET_B576000 0010006 | ||
| 103 | +#define TARGET_B921600 0010007 | ||
| 104 | +#define TARGET_B1000000 0010010 | ||
| 105 | +#define TARGET_B1152000 0010011 | ||
| 106 | +#define TARGET_B1500000 0010012 | ||
| 107 | +#define TARGET_B2000000 0010013 | ||
| 108 | +#define TARGET_B2500000 0010014 | ||
| 109 | +#define TARGET_B3000000 0010015 | ||
| 110 | +#define TARGET_B3500000 0010016 | ||
| 111 | +#define TARGET_B4000000 0010017 | ||
| 100 | #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ | 112 | #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ |
| 101 | -#define TARGET_CRTSCTS 020000000000 /* flow control */ | 113 | +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ |
| 114 | +#define TARGET_CRTSCTS 020000000000 /* flow control */ | ||
| 102 | 115 | ||
| 103 | /* c_lflag bits */ | 116 | /* c_lflag bits */ |
| 104 | #define TARGET_ISIG 0000001 | 117 | #define TARGET_ISIG 0000001 |
linux-user/ppc/termbits.h
| @@ -47,6 +47,7 @@ struct target_termios { | @@ -47,6 +47,7 @@ struct target_termios { | ||
| 47 | #define TARGET_IXANY 0004000 | 47 | #define TARGET_IXANY 0004000 |
| 48 | #define TARGET_IUCLC 0010000 | 48 | #define TARGET_IUCLC 0010000 |
| 49 | #define TARGET_IMAXBEL 0020000 | 49 | #define TARGET_IMAXBEL 0020000 |
| 50 | +#define TARGET_IUTF8 0040000 | ||
| 50 | 51 | ||
| 51 | /* c_oflag bits */ | 52 | /* c_oflag bits */ |
| 52 | #define TARGET_OPOST 0000001 | 53 | #define TARGET_OPOST 0000001 |
| @@ -69,6 +70,7 @@ struct target_termios { | @@ -69,6 +70,7 @@ struct target_termios { | ||
| 69 | #define TARGET_TAB1 00002000 | 70 | #define TARGET_TAB1 00002000 |
| 70 | #define TARGET_TAB2 00004000 | 71 | #define TARGET_TAB2 00004000 |
| 71 | #define TARGET_TAB3 00006000 | 72 | #define TARGET_TAB3 00006000 |
| 73 | +#define TARGET_XTABS 00006000 /* required by POSIX to == TAB3 */ | ||
| 72 | #define TARGET_CRDLY 00030000 | 74 | #define TARGET_CRDLY 00030000 |
| 73 | #define TARGET_CR0 00000000 | 75 | #define TARGET_CR0 00000000 |
| 74 | #define TARGET_CR1 00010000 | 76 | #define TARGET_CR1 00010000 |
| @@ -83,7 +85,6 @@ struct target_termios { | @@ -83,7 +85,6 @@ struct target_termios { | ||
| 83 | #define TARGET_VTDLY 00200000 | 85 | #define TARGET_VTDLY 00200000 |
| 84 | #define TARGET_VT0 00000000 | 86 | #define TARGET_VT0 00000000 |
| 85 | #define TARGET_VT1 00200000 | 87 | #define TARGET_VT1 00200000 |
| 86 | -#define TARGET_XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */ | ||
| 87 | 88 | ||
| 88 | /* c_cflag bit meaning */ | 89 | /* c_cflag bit meaning */ |
| 89 | #define TARGET_CBAUD 0000377 | 90 | #define TARGET_CBAUD 0000377 |
| @@ -135,7 +136,8 @@ struct target_termios { | @@ -135,7 +136,8 @@ struct target_termios { | ||
| 135 | #define TARGET_HUPCL 00040000 | 136 | #define TARGET_HUPCL 00040000 |
| 136 | 137 | ||
| 137 | #define TARGET_CLOCAL 00100000 | 138 | #define TARGET_CLOCAL 00100000 |
| 138 | -#define TARGET_CRTSCTS 020000000000 /* flow control */ | 139 | +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ |
| 140 | +#define TARGET_CRTSCTS 020000000000 /* flow control */ | ||
| 139 | 141 | ||
| 140 | /* c_lflag bits */ | 142 | /* c_lflag bits */ |
| 141 | #define TARGET_ISIG 0x00000080 | 143 | #define TARGET_ISIG 0x00000080 |
linux-user/ppc64/termbits.h
| @@ -27,10 +27,10 @@ struct target_termios { | @@ -27,10 +27,10 @@ struct target_termios { | ||
| 27 | 27 | ||
| 28 | #define TARGET_VWERASE 10 | 28 | #define TARGET_VWERASE 10 |
| 29 | #define TARGET_VREPRINT 11 | 29 | #define TARGET_VREPRINT 11 |
| 30 | -#define TARGET_VSUSP 12 | ||
| 31 | -#define TARGET_VSTART 13 | ||
| 32 | -#define TARGET_VSTOP 14 | ||
| 33 | -#define TARGET_VLNEXT 15 | 30 | +#define TARGET_VSUSP 12 |
| 31 | +#define TARGET_VSTART 13 | ||
| 32 | +#define TARGET_VSTOP 14 | ||
| 33 | +#define TARGET_VLNEXT 15 | ||
| 34 | #define TARGET_VDISCARD 16 | 34 | #define TARGET_VDISCARD 16 |
| 35 | 35 | ||
| 36 | #define TARGET_IGNBRK 0000001 | 36 | #define TARGET_IGNBRK 0000001 |
| @@ -47,6 +47,7 @@ struct target_termios { | @@ -47,6 +47,7 @@ struct target_termios { | ||
| 47 | #define TARGET_IXANY 0004000 | 47 | #define TARGET_IXANY 0004000 |
| 48 | #define TARGET_IUCLC 0010000 | 48 | #define TARGET_IUCLC 0010000 |
| 49 | #define TARGET_IMAXBEL 0020000 | 49 | #define TARGET_IMAXBEL 0020000 |
| 50 | +#define TARGET_IUTF8 0040000 | ||
| 50 | 51 | ||
| 51 | /* c_oflag bits */ | 52 | /* c_oflag bits */ |
| 52 | #define TARGET_OPOST 0000001 | 53 | #define TARGET_OPOST 0000001 |
| @@ -69,6 +70,7 @@ struct target_termios { | @@ -69,6 +70,7 @@ struct target_termios { | ||
| 69 | #define TARGET_TAB1 00002000 | 70 | #define TARGET_TAB1 00002000 |
| 70 | #define TARGET_TAB2 00004000 | 71 | #define TARGET_TAB2 00004000 |
| 71 | #define TARGET_TAB3 00006000 | 72 | #define TARGET_TAB3 00006000 |
| 73 | +#define TARGET_XTABS 00006000 /* required by POSIX to == TAB3 */ | ||
| 72 | #define TARGET_CRDLY 00030000 | 74 | #define TARGET_CRDLY 00030000 |
| 73 | #define TARGET_CR0 00000000 | 75 | #define TARGET_CR0 00000000 |
| 74 | #define TARGET_CR1 00010000 | 76 | #define TARGET_CR1 00010000 |
| @@ -83,7 +85,6 @@ struct target_termios { | @@ -83,7 +85,6 @@ struct target_termios { | ||
| 83 | #define TARGET_VTDLY 00200000 | 85 | #define TARGET_VTDLY 00200000 |
| 84 | #define TARGET_VT0 00000000 | 86 | #define TARGET_VT0 00000000 |
| 85 | #define TARGET_VT1 00200000 | 87 | #define TARGET_VT1 00200000 |
| 86 | -#define TARGET_XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */ | ||
| 87 | 88 | ||
| 88 | /* c_cflag bit meaning */ | 89 | /* c_cflag bit meaning */ |
| 89 | #define TARGET_CBAUD 0000377 | 90 | #define TARGET_CBAUD 0000377 |
| @@ -135,7 +136,8 @@ struct target_termios { | @@ -135,7 +136,8 @@ struct target_termios { | ||
| 135 | #define TARGET_HUPCL 00040000 | 136 | #define TARGET_HUPCL 00040000 |
| 136 | 137 | ||
| 137 | #define TARGET_CLOCAL 00100000 | 138 | #define TARGET_CLOCAL 00100000 |
| 138 | -#define TARGET_CRTSCTS 020000000000 /* flow control */ | 139 | +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ |
| 140 | +#define TARGET_CRTSCTS 020000000000 /* flow control */ | ||
| 139 | 141 | ||
| 140 | /* c_lflag bits */ | 142 | /* c_lflag bits */ |
| 141 | #define TARGET_ISIG 0x00000080 | 143 | #define TARGET_ISIG 0x00000080 |
linux-user/sparc/termbits.h
| @@ -51,6 +51,7 @@ struct target_termios { | @@ -51,6 +51,7 @@ struct target_termios { | ||
| 51 | #define TARGET_IXANY 0x00000800 | 51 | #define TARGET_IXANY 0x00000800 |
| 52 | #define TARGET_IXOFF 0x00001000 | 52 | #define TARGET_IXOFF 0x00001000 |
| 53 | #define TARGET_IMAXBEL 0x00002000 | 53 | #define TARGET_IMAXBEL 0x00002000 |
| 54 | +#define TARGET_IUTF8 0x00004000 | ||
| 54 | 55 | ||
| 55 | /* c_oflag bits */ | 56 | /* c_oflag bits */ |
| 56 | #define TARGET_OPOST 0x00000001 | 57 | #define TARGET_OPOST 0x00000001 |
linux-user/sparc64/termbits.h
| @@ -51,6 +51,7 @@ struct target_termios { | @@ -51,6 +51,7 @@ struct target_termios { | ||
| 51 | #define TARGET_IXANY 0x00000800 | 51 | #define TARGET_IXANY 0x00000800 |
| 52 | #define TARGET_IXOFF 0x00001000 | 52 | #define TARGET_IXOFF 0x00001000 |
| 53 | #define TARGET_IMAXBEL 0x00002000 | 53 | #define TARGET_IMAXBEL 0x00002000 |
| 54 | +#define TARGET_IUTF8 0x00004000 | ||
| 54 | 55 | ||
| 55 | /* c_oflag bits */ | 56 | /* c_oflag bits */ |
| 56 | #define TARGET_OPOST 0x00000001 | 57 | #define TARGET_OPOST 0x00000001 |