[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <30fae532c6ccfbdb6ae733e0e16abfc59ab9d3c3.1467552244.git.nsz@port70.net>
Date: Sun, 3 Jul 2016 17:07:56 +0200
From: Szabolcs Nagy <nsz@...t70.net>
To: musl@...ts.openwall.com
Subject: [PATCH 11/16] fix generic termios.h to be more consistent with glibc
add EXTA, EXTB, CIBAUD, CMSPAR, XCASE macros and hide them as well as
CBAUD, ECHOCTL, ECHOPRT, ECHOKE, FLUSHO, PENDIN in standard mode.
the new macros are both in glibc termios.h and in linux asm/termbits.h,
the later also contains IBSHIFT and BOTHER, those were not added.
these are not standard macros, but some of them are in the reserved
namespace so could be exposed, the ones which are not reserved are
CIBAUD, CMSPAR and XCASE (which was removed in issue 6), the rest
got hidden to be consistent with glibc.
---
arch/generic/bits/termios.h | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/arch/generic/bits/termios.h b/arch/generic/bits/termios.h
index f0d81b1..941de7b 100644
--- a/arch/generic/bits/termios.h
+++ b/arch/generic/bits/termios.h
@@ -109,8 +109,6 @@ struct termios
#define B3500000 0010016
#define B4000000 0010017
-#define CBAUD 0010017
-
#define CSIZE 0000060
#define CS5 0000000
#define CS6 0000020
@@ -133,12 +131,6 @@ struct termios
#define TOSTOP 0000400
#define IEXTEN 0100000
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-
#define TCOOFF 0
#define TCOON 1
#define TCIOFF 2
@@ -153,8 +145,21 @@ 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 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 0010000
+#define PENDIN 0040000
#define EXTPROC 0200000
+
#define XTABS 0014000
#endif
--
2.8.1
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.
