[PATCH 13/16] fix mips termios.h to be more consistent with glibc

mailing list of musl libc
 help / color / mirror / code / Atom feed

From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: [PATCH 13/16] fix mips termios.h to be more consistent with glibc
Date: Sun, 3 Jul 2016 17:08:54 +0200	[thread overview]
Message-ID: <42b6cc103b46034a36780066e00fad65ca642a2a.1467552244.git.nsz@port70.net> (raw)
In-Reply-To: <cover.1467552244.git.nsz@port70.net>

same changes to the defined macros as in powerpc and generic bits.
---
 arch/mips/bits/termios.h    | 29 ++++++++++++++---------------
 arch/mips64/bits/termios.h  | 29 ++++++++++++++---------------
 arch/mipsn32/bits/termios.h | 29 ++++++++++++++---------------
 3 files changed, 42 insertions(+), 45 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
diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h
index 3a7d5a1..d831cfa 100644
--- a/arch/mipsn32/bits/termios.h
+++ b/arch/mipsn32/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.8.1

next prev parent reply	other threads:[~2016-07-03 15:08 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-03 15:01 [PATCH 00/16] sys/ioctl.h and termios.h cleanups Szabolcs Nagy
2016-07-03 15:02 ` [PATCH 01/16] use the generic ioctl.h for x86_64, x32 and aarch64 Szabolcs Nagy
2016-07-03 15:02 ` [PATCH 02/16] remove linux asm/sockios.h macros from ioctl.h Szabolcs Nagy
2016-07-03 15:03 ` [PATCH 03/16] remove ioctl macros that were removed from linux uapi Szabolcs Nagy
2016-07-03 15:03 ` [PATCH 04/16] add missing SIOCSIFNAME from linux/sockios.h to ioctl.h Szabolcs Nagy
2016-07-03 15:04 ` [PATCH 05/16] add missing TIOC* macros " Szabolcs Nagy
2016-07-03 15:05 ` [PATCH 06/16] remove mips and powerpc ioctls that are missing from linux uapi Szabolcs Nagy
2016-07-03 15:05 ` [PATCH 07/16] fix mips, mips64, mipsn32 TIOCM_* macros in ioctl.h Szabolcs Nagy
2016-07-03 15:06 ` [PATCH 08/16] fix TIOCMSET in mips ioctl.h Szabolcs Nagy
2016-07-03 15:06 ` [PATCH 09/16] remove termios2 related ioctls from sh ioctl.h Szabolcs Nagy
2016-07-03 15:07 ` [PATCH 10/16] fix FIOQSIZE in arm ioctl.h Szabolcs Nagy
2016-07-03 15:07 ` [PATCH 11/16] fix generic termios.h to be more consistent with glibc Szabolcs Nagy
2016-07-03 15:08 ` [PATCH 12/16] fix powerpc " Szabolcs Nagy
2016-07-03 15:08 ` Szabolcs Nagy [this message]
2016-07-03 15:09 ` [PATCH 14/16] fix TCS* definitions in mips termios.h Szabolcs Nagy
2016-07-03 15:09 ` [PATCH 15/16] fix CBAUDEX in powerpc termios.h Szabolcs Nagy
2016-07-03 15:10 ` [PATCH 16/16] fix struct termios in mips64 and mipsn32 termios.h Szabolcs Nagy
2016-07-03 19:10 ` [PATCH 00/16] sys/ioctl.h and termios.h cleanups Rich Felker
  -- strict thread matches above, loose matches on Subject: below --
2016-04-10 12:09 Szabolcs Nagy
2016-04-10 12:15 ` [PATCH 13/16] fix mips termios.h to be more consistent with glibc Szabolcs Nagy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=42b6cc103b46034a36780066e00fad65ca642a2a.1467552244.git.nsz@port70.net \
    --to=nsz@port70.net \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).