|
|
Message-ID: <35d5dd17c8869e2528343e11ea4d92ae64ab94b1.1460250248.git.nsz@port70.net>
Date: Sun, 10 Apr 2016 14:15:29 +0200
From: Szabolcs Nagy <nsz@...t70.net>
To: musl@...ts.openwall.com
Subject: [PATCH 13/16] fix mips termios.h to be more consistent with glibc
same changes to the defined macros as in powerpc and generic bits.
---
arch/mips/bits/termios.h | 29 ++++++++++++++---------------
arch/mips64/bits/termios.h | 29 ++++++++++++++---------------
2 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h
index 487c1d4..55ba132 100644
--- a/arch/mips/bits/termios.h
+++ b/arch/mips/bits/termios.h
@@ -93,10 +93,7 @@ struct termios
#define B9600 0000015
#define B19200 0000016
#define B38400 0000017
-#define EXTA 0000016
-#define EXTB 0000017
-#define BOTHER 0010000
#define B57600 0010001
#define B115200 0010002
#define B230400 0010003
@@ -113,8 +110,6 @@ struct termios
#define B3500000 0010016
#define B4000000 0010017
-#define CBAUD 0010017
-
#define CSIZE 0000060
#define CS5 0000000
#define CS6 0000020
@@ -129,18 +124,12 @@ struct termios
#define ISIG 0000001
#define ICANON 0000002
-#define XCASE 0000004
#define ECHO 0000010
#define ECHOE 0000020
#define ECHOK 0000040
#define ECHONL 0000100
#define NOFLSH 0000200
#define IEXTEN 0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0020000
-#define PENDIN 0040000
#define TOSTOP 0100000
#define ITOSTOP 0100000
@@ -158,12 +147,22 @@ struct termios
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA 0000016
+#define EXTB 0000017
+#define CBAUD 0010017
#define CBAUDEX 0010000
-#define CIBAUD 002003600000
-#define IBSHIFT 16
-#define CMSPAR 010000000000
-#define CRTSCTS 020000000000
+#define CIBAUD 002003600000
+#define CMSPAR 010000000000
+#define CRTSCTS 020000000000
+
+#define XCASE 0000004
+#define ECHOCTL 0001000
+#define ECHOPRT 0002000
+#define ECHOKE 0004000
+#define FLUSHO 0020000
+#define PENDIN 0040000
#define EXTPROC 0200000
+
#define XTABS 0014000
#define TIOCSER_TEMT 1
#endif
diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h
index 3a7d5a1..d831cfa 100644
--- a/arch/mips64/bits/termios.h
+++ b/arch/mips64/bits/termios.h
@@ -90,10 +90,7 @@ struct termios {
#define B9600 0000015
#define B19200 0000016
#define B38400 0000017
-#define EXTA 0000016
-#define EXTB 0000017
-#define BOTHER 0010000
#define B57600 0010001
#define B115200 0010002
#define B230400 0010003
@@ -110,8 +107,6 @@ struct termios {
#define B3500000 0010016
#define B4000000 0010017
-#define CBAUD 0010017
-
#define CSIZE 0000060
#define CS5 0000000
#define CS6 0000020
@@ -126,18 +121,12 @@ struct termios {
#define ISIG 0000001
#define ICANON 0000002
-#define XCASE 0000004
#define ECHO 0000010
#define ECHOE 0000020
#define ECHOK 0000040
#define ECHONL 0000100
#define NOFLSH 0000200
#define IEXTEN 0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0020000
-#define PENDIN 0040000
#define TOSTOP 0100000
#define ITOSTOP 0100000
@@ -155,12 +144,22 @@ struct termios {
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA 0000016
+#define EXTB 0000017
+#define CBAUD 0010017
#define CBAUDEX 0010000
-#define CIBAUD 002003600000
-#define IBSHIFT 16
-#define CMSPAR 010000000000
-#define CRTSCTS 020000000000
+#define CIBAUD 002003600000
+#define CMSPAR 010000000000
+#define CRTSCTS 020000000000
+
+#define XCASE 0000004
+#define ECHOCTL 0001000
+#define ECHOPRT 0002000
+#define ECHOKE 0004000
+#define FLUSHO 0020000
+#define PENDIN 0040000
#define EXTPROC 0200000
+
#define XTABS 0014000
#define TIOCSER_TEMT 1
#endif
--
2.7.2
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.