[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <605550c9e190f22add0f970d66c4c5c79a96703b.1460250248.git.nsz@port70.net>
Date: Sun, 10 Apr 2016 14:11:02 +0200
From: Szabolcs Nagy <nsz@...t70.net>
To: musl@...ts.openwall.com
Subject: [PATCH 03/16] remove ioctl macros that were removed from linux uapi
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/powerpc/bits/ioctl.h | 7 -------
arch/sh/bits/ioctl.h | 2 --
5 files changed, 21 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/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/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.7.2
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.
