69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
From alan@lxorguk.ukuu.org.uk Wed May 23 18:43:50 2007
|
|
Date: Wed, 23 May 2007 17:44:46 +0100
|
|
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
|
|
To: geert@linux-m68k.org, zippel@linux-m68k.org
|
|
Subject: [PATCH] m68k: Enable arbitary speed tty support
|
|
|
|
Add the needed constants and defines to activate the existing code.
|
|
|
|
Signed-off-by: Alan Cox <alan@redhat.com>
|
|
|
|
---
|
|
include/asm-m68k/ioctls.h | 4 ++++
|
|
include/asm-m68k/termbits.h | 5 ++++-
|
|
include/asm-m68k/termios.h | 6 ++++--
|
|
3 files changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
--- a/include/asm-m68k/ioctls.h
|
|
+++ b/include/asm-m68k/ioctls.h
|
|
@@ -46,6 +46,10 @@
|
|
#define TIOCSBRK 0x5427 /* BSD compatibility */
|
|
#define TIOCCBRK 0x5428 /* BSD compatibility */
|
|
#define TIOCGSID 0x5429 /* Return the session ID of FD */
|
|
+#define TCGETS2 _IOR('T',0x2A, struct termios2)
|
|
+#define TCSETS2 _IOW('T',0x2B, struct termios2)
|
|
+#define TCSETSW2 _IOW('T',0x2C, struct termios2)
|
|
+#define TCSETSF2 _IOW('T',0x2D, struct termios2)
|
|
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
|
|
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
|
|
|
|
--- a/include/asm-m68k/termbits.h
|
|
+++ b/include/asm-m68k/termbits.h
|
|
@@ -141,6 +141,7 @@ struct ktermios {
|
|
#define HUPCL 0002000
|
|
#define CLOCAL 0004000
|
|
#define CBAUDEX 0010000
|
|
+#define BOTHER 0010000
|
|
#define B57600 0010001
|
|
#define B115200 0010002
|
|
#define B230400 0010003
|
|
@@ -156,10 +157,12 @@ struct ktermios {
|
|
#define B3000000 0010015
|
|
#define B3500000 0010016
|
|
#define B4000000 0010017
|
|
-#define CIBAUD 002003600000 /* input baud rate (not used) */
|
|
+#define CIBAUD 002003600000 /* input baud rate */
|
|
#define CMSPAR 010000000000 /* mark or space (stick) parity */
|
|
#define CRTSCTS 020000000000 /* flow control */
|
|
|
|
+#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */
|
|
+
|
|
/* c_lflag bits */
|
|
#define ISIG 0000001
|
|
#define ICANON 0000002
|
|
--- a/include/asm-m68k/termios.h
|
|
+++ b/include/asm-m68k/termios.h
|
|
@@ -82,8 +82,10 @@ struct termio {
|
|
copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
|
|
})
|
|
|
|
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
|
|
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
|
|
+#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
|
|
+#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
|
|
+#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
|
|
+#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
|
|
|
|
#endif /* __KERNEL__ */
|
|
|