375 lines
12 KiB
Diff
375 lines
12 KiB
Diff
From alan@lxorguk.ukuu.org.uk Wed May 23 21:55:17 2007
|
|
Date: Wed, 23 May 2007 20:56:45 +0100
|
|
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
|
|
To: Geert Uytterhoeven <geert@linux-m68k.org>
|
|
Cc: Roman Zippel <zippel@linux-m68k.org>, Linux Kernel Development <linux-kernel@vger.kernel.org>, akpm@osdl.org, rmk@arm.linux.kernel.org, spyro@f2s.com, starvik@axis.com, ysato@users.sourceforge.jp, "Luck, Tony" <tony.luck@intel.com>, takata@linux-m32r.org, chris@zankel.net, uclinux-v850@lsi.nec.co.jp, kyle@parisc-linux.org, linux-mips@linux-mips.org
|
|
Subject: Re: [PATCH] m68k: Enable arbitary speed tty support
|
|
|
|
> > +#define TCSETS2 _IOW('T',0x2B, struct termios2)
|
|
> > +#define TCSETSW2 _IOW('T',0x2C, struct termios2)
|
|
> > +#define TCSETSF2 _IOW('T',0x2D, struct termios2)
|
|
>
|
|
> Where is `struct termios2' defined? Right now it doesn't compile because
|
|
> of that.
|
|
>
|
|
|
|
Sorry, shortage of qualified gnomes: One of them forgot to post this diff first
|
|
|
|
Add the termios2 structure ready for enabling on most platforms. One or two like
|
|
Sparc are plain weird so have been left alone. Most can use the same structure as
|
|
ktermios for termios2 (ie the newer ioctl uses the structure matching the current
|
|
kernel structure)
|
|
|
|
(cc'd various maintainers who get stuff)
|
|
|
|
Signed-off-by: Alan Cox <alan@redhat.com>
|
|
|
|
ddiff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc1-mm1/include/asm-arm/termbits.h linux-2.6.22-rc1-mm1/include/asm-arm/termbits.h
|
|
---
|
|
include/asm-arm/termbits.h | 11 +++++++++++
|
|
include/asm-arm26/termbits.h | 12 +++++++++++-
|
|
include/asm-avr32/termbits.h | 11 +++++++++++
|
|
include/asm-blackfin/termbits.h | 11 +++++++++++
|
|
include/asm-cris/termbits.h | 11 +++++++++++
|
|
include/asm-frv/termbits.h | 11 +++++++++++
|
|
include/asm-h8300/termbits.h | 11 +++++++++++
|
|
include/asm-ia64/termbits.h | 11 +++++++++++
|
|
include/asm-m32r/termbits.h | 11 +++++++++++
|
|
include/asm-m68k/termbits.h | 11 +++++++++++
|
|
include/asm-mips/termbits.h | 11 +++++++++++
|
|
include/asm-parisc/termbits.h | 11 +++++++++++
|
|
include/asm-s390/termbits.h | 11 +++++++++++
|
|
include/asm-sh/termbits.h | 11 +++++++++++
|
|
include/asm-v850/termbits.h | 11 +++++++++++
|
|
include/asm-xtensa/termbits.h | 11 +++++++++++
|
|
16 files changed, 176 insertions(+), 1 deletion(-)
|
|
|
|
--- a/include/asm-arm/termbits.h
|
|
+++ b/include/asm-arm/termbits.h
|
|
@@ -26,6 +26,17 @@ struct termios2 {
|
|
speed_t c_ospeed; /* output speed */
|
|
};
|
|
|
|
+struct termios_2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-arm26/termbits.h
|
|
+++ b/include/asm-arm26/termbits.h
|
|
@@ -15,7 +15,7 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
-struct ktermios {
|
|
+struct termios2 {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
tcflag_t c_cflag; /* control mode flags */
|
|
@@ -26,6 +26,16 @@ struct ktermios {
|
|
speed_t c_ospeed; /* output speed */
|
|
};
|
|
|
|
+struct ktermios {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
|
|
/* c_cc characters */
|
|
#define VINTR 0
|
|
--- a/include/asm-avr32/termbits.h
|
|
+++ b/include/asm-avr32/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-blackfin/termbits.h
|
|
+++ b/include/asm-blackfin/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-cris/termbits.h
|
|
+++ b/include/asm-cris/termbits.h
|
|
@@ -19,6 +19,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-frv/termbits.h
|
|
+++ b/include/asm-frv/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-h8300/termbits.h
|
|
+++ b/include/asm-h8300/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-ia64/termbits.h
|
|
+++ b/include/asm-ia64/termbits.h
|
|
@@ -26,6 +26,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-m32r/termbits.h
|
|
+++ b/include/asm-m32r/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-m68k/termbits.h
|
|
+++ b/include/asm-m68k/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-mips/termbits.h
|
|
+++ b/include/asm-mips/termbits.h
|
|
@@ -30,6 +30,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-parisc/termbits.h
|
|
+++ b/include/asm-parisc/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-s390/termbits.h
|
|
+++ b/include/asm-s390/termbits.h
|
|
@@ -25,6 +25,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-sh/termbits.h
|
|
+++ b/include/asm-sh/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-v850/termbits.h
|
|
+++ b/include/asm-v850/termbits.h
|
|
@@ -17,6 +17,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|
|
--- a/include/asm-xtensa/termbits.h
|
|
+++ b/include/asm-xtensa/termbits.h
|
|
@@ -30,6 +30,17 @@ struct termios {
|
|
cc_t c_cc[NCCS]; /* control characters */
|
|
};
|
|
|
|
+struct termios2 {
|
|
+ tcflag_t c_iflag; /* input mode flags */
|
|
+ tcflag_t c_oflag; /* output mode flags */
|
|
+ tcflag_t c_cflag; /* control mode flags */
|
|
+ tcflag_t c_lflag; /* local mode flags */
|
|
+ cc_t c_line; /* line discipline */
|
|
+ cc_t c_cc[NCCS]; /* control characters */
|
|
+ speed_t c_ispeed; /* input speed */
|
|
+ speed_t c_ospeed; /* output speed */
|
|
+};
|
|
+
|
|
struct ktermios {
|
|
tcflag_t c_iflag; /* input mode flags */
|
|
tcflag_t c_oflag; /* output mode flags */
|