From f05d35d26da3bcec318e23b943223f83d5e90add Mon Sep 17 00:00:00 2001 From: ths Date: Sun, 23 Sep 2007 23:27:46 +0000 Subject: [PATCH] Sync termbits.h with current Linux kernel. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3215 c046a42c-6fe2-441c-8c8c-71466251a162 --- linux-user/arm/termbits.h | 4 +++- linux-user/i386/termbits.h | 15 ++++++++++++++- linux-user/m68k/termbits.h | 15 ++++++++++++++- linux-user/ppc/termbits.h | 6 ++++-- linux-user/ppc64/termbits.h | 14 ++++++++------ linux-user/sparc/termbits.h | 1 + linux-user/sparc64/termbits.h | 1 + 7 files changed, 45 insertions(+), 11 deletions(-) diff --git a/linux-user/arm/termbits.h b/linux-user/arm/termbits.h index 36ead08957..f018c07581 100644 --- a/linux-user/arm/termbits.h +++ b/linux-user/arm/termbits.h @@ -27,6 +27,7 @@ struct target_termios { #define TARGET_IXANY 0004000 #define TARGET_IXOFF 0010000 #define TARGET_IMAXBEL 0020000 +#define TARGET_IUTF8 0040000 /* c_oflag bits */ #define TARGET_OPOST 0000001 @@ -98,7 +99,8 @@ struct target_termios { #define TARGET_B230400 0010003 #define TARGET_B460800 0010004 #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ -#define TARGET_CRTSCTS 020000000000 /* flow control */ +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ +#define TARGET_CRTSCTS 020000000000 /* flow control */ /* c_lflag bits */ #define TARGET_ISIG 0000001 diff --git a/linux-user/i386/termbits.h b/linux-user/i386/termbits.h index adff80243e..4acd2bda01 100644 --- a/linux-user/i386/termbits.h +++ b/linux-user/i386/termbits.h @@ -26,6 +26,7 @@ struct target_termios { #define TARGET_IXANY 0004000 #define TARGET_IXOFF 0010000 #define TARGET_IMAXBEL 0020000 +#define TARGET_IUTF8 0040000 /* c_oflag bits */ #define TARGET_OPOST 0000001 @@ -96,8 +97,20 @@ struct target_termios { #define TARGET_B115200 0010002 #define TARGET_B230400 0010003 #define TARGET_B460800 0010004 +#define TARGET_B500000 0010005 +#define TARGET_B576000 0010006 +#define TARGET_B921600 0010007 +#define TARGET_B1000000 0010010 +#define TARGET_B1152000 0010011 +#define TARGET_B1500000 0010012 +#define TARGET_B2000000 0010013 +#define TARGET_B2500000 0010014 +#define TARGET_B3000000 0010015 +#define TARGET_B3500000 0010016 +#define TARGET_B4000000 0010017 #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ -#define TARGET_CRTSCTS 020000000000 /* flow control */ +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ +#define TARGET_CRTSCTS 020000000000 /* flow control */ /* c_lflag bits */ #define TARGET_ISIG 0000001 diff --git a/linux-user/m68k/termbits.h b/linux-user/m68k/termbits.h index 36ead08957..1bce39d818 100644 --- a/linux-user/m68k/termbits.h +++ b/linux-user/m68k/termbits.h @@ -27,6 +27,7 @@ struct target_termios { #define TARGET_IXANY 0004000 #define TARGET_IXOFF 0010000 #define TARGET_IMAXBEL 0020000 +#define TARGET_IUTF8 0040000 /* c_oflag bits */ #define TARGET_OPOST 0000001 @@ -97,8 +98,20 @@ struct target_termios { #define TARGET_B115200 0010002 #define TARGET_B230400 0010003 #define TARGET_B460800 0010004 +#define TARGET_B500000 0010005 +#define TARGET_B576000 0010006 +#define TARGET_B921600 0010007 +#define TARGET_B1000000 0010010 +#define TARGET_B1152000 0010011 +#define TARGET_B1500000 0010012 +#define TARGET_B2000000 0010013 +#define TARGET_B2500000 0010014 +#define TARGET_B3000000 0010015 +#define TARGET_B3500000 0010016 +#define TARGET_B4000000 0010017 #define TARGET_CIBAUD 002003600000 /* input baud rate (not used) */ -#define TARGET_CRTSCTS 020000000000 /* flow control */ +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ +#define TARGET_CRTSCTS 020000000000 /* flow control */ /* c_lflag bits */ #define TARGET_ISIG 0000001 diff --git a/linux-user/ppc/termbits.h b/linux-user/ppc/termbits.h index 7bf14eb5c3..002de9564f 100644 --- a/linux-user/ppc/termbits.h +++ b/linux-user/ppc/termbits.h @@ -47,6 +47,7 @@ struct target_termios { #define TARGET_IXANY 0004000 #define TARGET_IUCLC 0010000 #define TARGET_IMAXBEL 0020000 +#define TARGET_IUTF8 0040000 /* c_oflag bits */ #define TARGET_OPOST 0000001 @@ -69,6 +70,7 @@ struct target_termios { #define TARGET_TAB1 00002000 #define TARGET_TAB2 00004000 #define TARGET_TAB3 00006000 +#define TARGET_XTABS 00006000 /* required by POSIX to == TAB3 */ #define TARGET_CRDLY 00030000 #define TARGET_CR0 00000000 #define TARGET_CR1 00010000 @@ -83,7 +85,6 @@ struct target_termios { #define TARGET_VTDLY 00200000 #define TARGET_VT0 00000000 #define TARGET_VT1 00200000 -#define TARGET_XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */ /* c_cflag bit meaning */ #define TARGET_CBAUD 0000377 @@ -135,7 +136,8 @@ struct target_termios { #define TARGET_HUPCL 00040000 #define TARGET_CLOCAL 00100000 -#define TARGET_CRTSCTS 020000000000 /* flow control */ +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ +#define TARGET_CRTSCTS 020000000000 /* flow control */ /* c_lflag bits */ #define TARGET_ISIG 0x00000080 diff --git a/linux-user/ppc64/termbits.h b/linux-user/ppc64/termbits.h index 7bf14eb5c3..41537ed39e 100644 --- a/linux-user/ppc64/termbits.h +++ b/linux-user/ppc64/termbits.h @@ -27,10 +27,10 @@ struct target_termios { #define TARGET_VWERASE 10 #define TARGET_VREPRINT 11 -#define TARGET_VSUSP 12 -#define TARGET_VSTART 13 -#define TARGET_VSTOP 14 -#define TARGET_VLNEXT 15 +#define TARGET_VSUSP 12 +#define TARGET_VSTART 13 +#define TARGET_VSTOP 14 +#define TARGET_VLNEXT 15 #define TARGET_VDISCARD 16 #define TARGET_IGNBRK 0000001 @@ -47,6 +47,7 @@ struct target_termios { #define TARGET_IXANY 0004000 #define TARGET_IUCLC 0010000 #define TARGET_IMAXBEL 0020000 +#define TARGET_IUTF8 0040000 /* c_oflag bits */ #define TARGET_OPOST 0000001 @@ -69,6 +70,7 @@ struct target_termios { #define TARGET_TAB1 00002000 #define TARGET_TAB2 00004000 #define TARGET_TAB3 00006000 +#define TARGET_XTABS 00006000 /* required by POSIX to == TAB3 */ #define TARGET_CRDLY 00030000 #define TARGET_CR0 00000000 #define TARGET_CR1 00010000 @@ -83,7 +85,6 @@ struct target_termios { #define TARGET_VTDLY 00200000 #define TARGET_VT0 00000000 #define TARGET_VT1 00200000 -#define TARGET_XTABS 01000000 /* Hmm.. Linux/i386 considers this part of TABDLY.. */ /* c_cflag bit meaning */ #define TARGET_CBAUD 0000377 @@ -135,7 +136,8 @@ struct target_termios { #define TARGET_HUPCL 00040000 #define TARGET_CLOCAL 00100000 -#define TARGET_CRTSCTS 020000000000 /* flow control */ +#define TARGET_CMSPAR 010000000000 /* mark or space (stick) parity */ +#define TARGET_CRTSCTS 020000000000 /* flow control */ /* c_lflag bits */ #define TARGET_ISIG 0x00000080 diff --git a/linux-user/sparc/termbits.h b/linux-user/sparc/termbits.h index 3ec8e97c79..ed9ab24552 100644 --- a/linux-user/sparc/termbits.h +++ b/linux-user/sparc/termbits.h @@ -51,6 +51,7 @@ struct target_termios { #define TARGET_IXANY 0x00000800 #define TARGET_IXOFF 0x00001000 #define TARGET_IMAXBEL 0x00002000 +#define TARGET_IUTF8 0x00004000 /* c_oflag bits */ #define TARGET_OPOST 0x00000001 diff --git a/linux-user/sparc64/termbits.h b/linux-user/sparc64/termbits.h index 3ec8e97c79..ed9ab24552 100644 --- a/linux-user/sparc64/termbits.h +++ b/linux-user/sparc64/termbits.h @@ -51,6 +51,7 @@ struct target_termios { #define TARGET_IXANY 0x00000800 #define TARGET_IXOFF 0x00001000 #define TARGET_IMAXBEL 0x00002000 +#define TARGET_IUTF8 0x00004000 /* c_oflag bits */ #define TARGET_OPOST 0x00000001