From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: [PATCH 07/16] fix mips and mips64 TIOCM_* macros in ioctl.h
Date: Sun, 10 Apr 2016 14:12:36 +0200 [thread overview]
Message-ID: <9c433f861add049a50c95f8b21253636a0e7cdda.1460250248.git.nsz@port70.net> (raw)
In-Reply-To: <cover.1460250248.git.nsz@port70.net>
TIOCM_ macros were wrongly using the asm-generic/termios.h definitions
instead of the mips specific ones from asm/termios.h
---
arch/mips/bits/ioctl.h | 28 ++++++++++++++--------------
arch/mips64/bits/ioctl.h | 28 ++++++++++++++--------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h
index 18bfeba..a9e39d4 100644
--- a/arch/mips/bits/ioctl.h
+++ b/arch/mips/bits/ioctl.h
@@ -107,20 +107,20 @@ struct winsize {
unsigned short ws_ypixel;
};
-#define TIOCM_LE 0x001
-#define TIOCM_DTR 0x002
-#define TIOCM_RTS 0x004
-#define TIOCM_ST 0x008
-#define TIOCM_SR 0x010
-#define TIOCM_CTS 0x020
-#define TIOCM_CAR 0x040
-#define TIOCM_RNG 0x080
-#define TIOCM_DSR 0x100
-#define TIOCM_CD TIOCM_CAR
-#define TIOCM_RI TIOCM_RNG
-#define TIOCM_OUT1 0x2000
-#define TIOCM_OUT2 0x4000
-#define TIOCM_LOOP 0x8000
+#define TIOCM_LE 0x001
+#define TIOCM_DTR 0x002
+#define TIOCM_RTS 0x004
+#define TIOCM_ST 0x010
+#define TIOCM_SR 0x020
+#define TIOCM_CTS 0x040
+#define TIOCM_CAR 0x100
+#define TIOCM_CD TIOCM_CAR
+#define TIOCM_RNG 0x200
+#define TIOCM_RI TIOCM_RNG
+#define TIOCM_DSR 0x400
+#define TIOCM_OUT1 0x2000
+#define TIOCM_OUT2 0x4000
+#define TIOCM_LOOP 0x8000
#define N_TTY 0
#define N_SLIP 1
diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h
index 18bfeba..a9e39d4 100644
--- a/arch/mips64/bits/ioctl.h
+++ b/arch/mips64/bits/ioctl.h
@@ -107,20 +107,20 @@ struct winsize {
unsigned short ws_ypixel;
};
-#define TIOCM_LE 0x001
-#define TIOCM_DTR 0x002
-#define TIOCM_RTS 0x004
-#define TIOCM_ST 0x008
-#define TIOCM_SR 0x010
-#define TIOCM_CTS 0x020
-#define TIOCM_CAR 0x040
-#define TIOCM_RNG 0x080
-#define TIOCM_DSR 0x100
-#define TIOCM_CD TIOCM_CAR
-#define TIOCM_RI TIOCM_RNG
-#define TIOCM_OUT1 0x2000
-#define TIOCM_OUT2 0x4000
-#define TIOCM_LOOP 0x8000
+#define TIOCM_LE 0x001
+#define TIOCM_DTR 0x002
+#define TIOCM_RTS 0x004
+#define TIOCM_ST 0x010
+#define TIOCM_SR 0x020
+#define TIOCM_CTS 0x040
+#define TIOCM_CAR 0x100
+#define TIOCM_CD TIOCM_CAR
+#define TIOCM_RNG 0x200
+#define TIOCM_RI TIOCM_RNG
+#define TIOCM_DSR 0x400
+#define TIOCM_OUT1 0x2000
+#define TIOCM_OUT2 0x4000
+#define TIOCM_LOOP 0x8000
#define N_TTY 0
#define N_SLIP 1
--
2.7.2
next prev parent reply other threads:[~2016-04-10 12:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-10 12:09 [PATCH 00/16] sys/ioctl.h and termios.h cleanups Szabolcs Nagy
2016-04-10 12:10 ` [PATCH 01/16] use the generic ioctl.h for x86_64, x32 and aarch64 Szabolcs Nagy
2016-04-10 12:10 ` [PATCH 02/16] remove linux asm/sockios.h macros from ioctl.h Szabolcs Nagy
2016-04-10 12:11 ` [PATCH 03/16] remove ioctl macros that were removed from linux uapi Szabolcs Nagy
2016-04-10 12:11 ` [PATCH 04/16] add missing SIOCSIFNAME from linux/sockios.h to ioctl.h Szabolcs Nagy
2016-04-10 12:11 ` [PATCH 05/16] add missing TIOC* macros " Szabolcs Nagy
2016-04-10 12:12 ` [PATCH 06/16] remove mips and powerpc ioctls that are missing from linux uapi Szabolcs Nagy
2016-04-10 12:12 ` Szabolcs Nagy [this message]
2016-04-10 12:12 ` [PATCH 08/16] fix TIOCMSET in mips ioctl.h Szabolcs Nagy
2016-04-10 12:13 ` [PATCH 09/16] remove termios2 related ioctls from sh ioctl.h Szabolcs Nagy
2016-04-10 12:13 ` [PATCH 10/16] fix FIOQSIZE in arm ioctl.h Szabolcs Nagy
2016-04-10 12:14 ` [PATCH 11/16] fix generic termios.h to be more consistent with glibc Szabolcs Nagy
2016-04-10 12:14 ` [PATCH 12/16] fix powerpc " Szabolcs Nagy
2016-04-10 12:15 ` [PATCH 13/16] fix mips " Szabolcs Nagy
2016-04-10 12:15 ` [PATCH 14/16] fix TCS* definitions in mips termios.h Szabolcs Nagy
2016-04-10 12:16 ` [PATCH 15/16] fix CBAUDEX in powerpc termios.h Szabolcs Nagy
2016-04-10 12:16 ` [PATCH 16/16] fix struct termios in mips termios.h Szabolcs Nagy
2016-07-01 19:00 ` Rich Felker
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=9c433f861add049a50c95f8b21253636a0e7cdda.1460250248.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).