From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: [PATCH 12/16] fix powerpc termios.h to be more consistent with glibc
Date: Sun, 3 Jul 2016 17:08:24 +0200 [thread overview]
Message-ID: <25bb12e03b7afb67cbd04152c6e71e42932e5138.1467552244.git.nsz@port70.net> (raw)
In-Reply-To: <cover.1467552244.git.nsz@port70.net>
same changes as in the generic header.
and BOTHER and IBSHIFT were removed (present in linux uapi but not
in glibc) and TIOCSER_TEMT was added (present in glibc).
---
arch/powerpc/bits/termios.h | 24 ++++++++++++------------
arch/powerpc64/bits/termios.h | 24 ++++++++++++------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/powerpc/bits/termios.h b/arch/powerpc/bits/termios.h
index 7feaf49..d2fc297 100644
--- a/arch/powerpc/bits/termios.h
+++ b/arch/powerpc/bits/termios.h
@@ -96,8 +96,6 @@ struct termios
#define B9600 0000015
#define B19200 0000016
#define B38400 0000017
-#define EXTA 0000016
-#define EXTB 0000017
#define B57600 00020
#define B115200 00021
@@ -114,9 +112,6 @@ struct termios
#define B3000000 00034
#define B3500000 00035
#define B4000000 00036
-#define BOTHER 00037
-
-#define CBAUD 00377
#define CSIZE 00001400
#define CS5 00000000
@@ -130,20 +125,14 @@ struct termios
#define HUPCL 00040000
#define CLOCAL 00100000
-#define ECHOKE 0x00000001
#define ECHOE 0x00000002
#define ECHOK 0x00000004
#define ECHO 0x00000008
#define ECHONL 0x00000010
-#define ECHOPRT 0x00000020
-#define ECHOCTL 0x00000040
#define ISIG 0x00000080
#define ICANON 0x00000100
#define IEXTEN 0x00000400
-#define XCASE 0x00004000
#define TOSTOP 0x00400000
-#define FLUSHO 0x00800000
-#define PENDIN 0x20000000
#define NOFLSH 0x80000000
#define TCOOFF 0
@@ -160,11 +149,22 @@ struct termios
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA 0000016
+#define EXTB 0000017
+#define CBAUD 00377
#define CBAUDEX 0000000
#define CIBAUD 077600000
-#define IBSHIFT 16
#define CMSPAR 010000000000
#define CRTSCTS 020000000000
+
+#define XCASE 0x00004000
+#define ECHOCTL 0x00000040
+#define ECHOPRT 0x00000020
+#define ECHOKE 0x00000001
+#define FLUSHO 0x00800000
+#define PENDIN 0x20000000
#define EXTPROC 0x10000000
+
#define XTABS 00006000
+#define TIOCSER_TEMT 1
#endif
diff --git a/arch/powerpc64/bits/termios.h b/arch/powerpc64/bits/termios.h
index 7feaf49..d2fc297 100644
--- a/arch/powerpc64/bits/termios.h
+++ b/arch/powerpc64/bits/termios.h
@@ -96,8 +96,6 @@ struct termios
#define B9600 0000015
#define B19200 0000016
#define B38400 0000017
-#define EXTA 0000016
-#define EXTB 0000017
#define B57600 00020
#define B115200 00021
@@ -114,9 +112,6 @@ struct termios
#define B3000000 00034
#define B3500000 00035
#define B4000000 00036
-#define BOTHER 00037
-
-#define CBAUD 00377
#define CSIZE 00001400
#define CS5 00000000
@@ -130,20 +125,14 @@ struct termios
#define HUPCL 00040000
#define CLOCAL 00100000
-#define ECHOKE 0x00000001
#define ECHOE 0x00000002
#define ECHOK 0x00000004
#define ECHO 0x00000008
#define ECHONL 0x00000010
-#define ECHOPRT 0x00000020
-#define ECHOCTL 0x00000040
#define ISIG 0x00000080
#define ICANON 0x00000100
#define IEXTEN 0x00000400
-#define XCASE 0x00004000
#define TOSTOP 0x00400000
-#define FLUSHO 0x00800000
-#define PENDIN 0x20000000
#define NOFLSH 0x80000000
#define TCOOFF 0
@@ -160,11 +149,22 @@ struct termios
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define EXTA 0000016
+#define EXTB 0000017
+#define CBAUD 00377
#define CBAUDEX 0000000
#define CIBAUD 077600000
-#define IBSHIFT 16
#define CMSPAR 010000000000
#define CRTSCTS 020000000000
+
+#define XCASE 0x00004000
+#define ECHOCTL 0x00000040
+#define ECHOPRT 0x00000020
+#define ECHOKE 0x00000001
+#define FLUSHO 0x00800000
+#define PENDIN 0x20000000
#define EXTPROC 0x10000000
+
#define XTABS 00006000
+#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 ` Szabolcs Nagy [this message]
2016-07-03 15:08 ` [PATCH 13/16] fix mips " Szabolcs Nagy
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:14 ` [PATCH 12/16] fix powerpc 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=25bb12e03b7afb67cbd04152c6e71e42932e5138.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).