From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: [PATCH 03/16] remove ioctl macros that were removed from linux uapi
Date: Sun, 3 Jul 2016 17:03:19 +0200 [thread overview]
Message-ID: <643e7fdb82c02812e6e6efe21f79e780d6b7f84b.1467552244.git.nsz@port70.net> (raw)
In-Reply-To: <cover.1467552244.git.nsz@port70.net>
TIOCTTYGSTRUCT, TIOCGHAYESESP, TIOCSHAYESESP and TIOCM_MODEM_BITS
were removed from the linux uapi and not present in glibc ioctl.h
---
arch/generic/bits/ioctl.h | 4 ----
arch/mips/bits/ioctl.h | 4 ----
arch/mips64/bits/ioctl.h | 4 ----
arch/mipsn32/bits/ioctl.h | 4 ----
arch/powerpc/bits/ioctl.h | 7 -------
arch/powerpc64/bits/ioctl.h | 7 -------
arch/sh/bits/ioctl.h | 2 --
7 files changed, 32 deletions(-)
diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h
index df0d944..acd9965 100644
--- a/arch/generic/bits/ioctl.h
+++ b/arch/generic/bits/ioctl.h
@@ -46,7 +46,6 @@
#define TIOCSETD 0x5423
#define TIOCGETD 0x5424
#define TCSBRKP 0x5425
-#define TIOCTTYGSTRUCT 0x5426
#define TIOCSBRK 0x5427
#define TIOCCBRK 0x5428
#define TIOCGSID 0x5429
@@ -72,8 +71,6 @@
#define TIOCMIWAIT 0x545C
#define TIOCGICOUNT 0x545D
-#define TIOCGHAYESESP 0x545E
-#define TIOCSHAYESESP 0x545F
#define FIOQSIZE 0x5460
#define TIOCPKT_DATA 0
@@ -108,7 +105,6 @@ struct winsize {
#define TIOCM_OUT1 0x2000
#define TIOCM_OUT2 0x4000
#define TIOCM_LOOP 0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
#define N_TTY 0
#define N_SLIP 1
diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h
index 4687d21..ee9cdb1 100644
--- a/arch/mips/bits/ioctl.h
+++ b/arch/mips/bits/ioctl.h
@@ -80,10 +80,7 @@
#define TIOCSERSETMULTI 0x5490
#define TIOCMIWAIT 0x5491
#define TIOCGICOUNT 0x5492
-#define TIOCGHAYESESP 0x5493
-#define TIOCSHAYESESP 0x5494
-#define TIOCTTYGSTRUCT 0x5426 // RICH: Not sure about these.
#define TCGETX 0x5432 // RICH: Not sure about these.
#define TCSETX 0x5433 // RICH: Not sure about these.
#define TCSETXF 0x5434 // RICH: Not sure about these.
@@ -121,7 +118,6 @@ struct winsize {
#define TIOCM_OUT1 0x2000
#define TIOCM_OUT2 0x4000
#define TIOCM_LOOP 0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
#define N_TTY 0
#define N_SLIP 1
diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h
index 60c99ba..e00e3d4 100644
--- a/arch/mips64/bits/ioctl.h
+++ b/arch/mips64/bits/ioctl.h
@@ -80,10 +80,7 @@
#define TIOCSERSETMULTI 0x5490
#define TIOCMIWAIT 0x5491
#define TIOCGICOUNT 0x5492
-#define TIOCGHAYESESP 0x5493
-#define TIOCSHAYESESP 0x5494
-#define TIOCTTYGSTRUCT 0x5426
#define TCGETX 0x5432
#define TCSETX 0x5433
#define TCSETXF 0x5434
@@ -121,7 +118,6 @@ struct winsize {
#define TIOCM_OUT1 0x2000
#define TIOCM_OUT2 0x4000
#define TIOCM_LOOP 0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
#define N_TTY 0
#define N_SLIP 1
diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h
index 60c99ba..e00e3d4 100644
--- a/arch/mipsn32/bits/ioctl.h
+++ b/arch/mipsn32/bits/ioctl.h
@@ -80,10 +80,7 @@
#define TIOCSERSETMULTI 0x5490
#define TIOCMIWAIT 0x5491
#define TIOCGICOUNT 0x5492
-#define TIOCGHAYESESP 0x5493
-#define TIOCSHAYESESP 0x5494
-#define TIOCTTYGSTRUCT 0x5426
#define TCGETX 0x5432
#define TCSETX 0x5433
#define TCSETXF 0x5434
@@ -121,7 +118,6 @@ struct winsize {
#define TIOCM_OUT1 0x2000
#define TIOCM_OUT2 0x4000
#define TIOCM_LOOP 0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
#define N_TTY 0
#define N_SLIP 1
diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h
index a2a845a..94b9ed0 100644
--- a/arch/powerpc/bits/ioctl.h
+++ b/arch/powerpc/bits/ioctl.h
@@ -120,16 +120,11 @@
/* end kernel header ioctls.h */
-#define TIOCTTYGSTRUCT 0x5426
-
#define TCGETX 0x5432
#define TCSETX 0x5433
#define TCSETXF 0x5434
#define TCSETXW 0x5435
-#define TIOCGHAYESESP 0x545E
-#define TIOCSHAYESESP 0x545F
-
struct winsize {
unsigned short ws_row;
unsigned short ws_col;
@@ -137,8 +132,6 @@ struct winsize {
unsigned short ws_ypixel;
};
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
#define N_TTY 0
#define N_SLIP 1
#define N_MOUSE 2
diff --git a/arch/powerpc64/bits/ioctl.h b/arch/powerpc64/bits/ioctl.h
index 0d70dc1..0640eef 100644
--- a/arch/powerpc64/bits/ioctl.h
+++ b/arch/powerpc64/bits/ioctl.h
@@ -123,16 +123,11 @@
/* end kernel header ioctls.h */
-#define TIOCTTYGSTRUCT 0x5426
-
#define TCGETX 0x5432
#define TCSETX 0x5433
#define TCSETXF 0x5434
#define TCSETXW 0x5435
-#define TIOCGHAYESESP 0x545E
-#define TIOCSHAYESESP 0x545F
-
struct winsize {
unsigned short ws_row;
unsigned short ws_col;
@@ -140,8 +135,6 @@ struct winsize {
unsigned short ws_ypixel;
};
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
#define N_TTY 0
#define N_SLIP 1
#define N_MOUSE 2
diff --git a/arch/sh/bits/ioctl.h b/arch/sh/bits/ioctl.h
index 73fb55c..6157983 100644
--- a/arch/sh/bits/ioctl.h
+++ b/arch/sh/bits/ioctl.h
@@ -119,8 +119,6 @@ struct winsize {
unsigned short ws_ypixel;
};
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
#define N_TTY 0
#define N_SLIP 1
#define N_MOUSE 2
--
2.8.1
next prev parent reply other threads:[~2016-07-03 15:03 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 ` Szabolcs Nagy [this message]
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 ` [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:11 ` [PATCH 03/16] remove ioctl macros that were removed from linux uapi 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=643e7fdb82c02812e6e6efe21f79e780d6b7f84b.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).