From 4e040be86a3f5c30ca572440f7b3f6f6713a9e33 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Fri, 8 Dec 2006 02:38:48 -0800
Subject: [PATCH] --- yaml --- r: 43691 b: refs/heads/master c:
 592ee3a5e5e2a981ef2829a0380093006d045661 h: refs/heads/master i:   43689:
 4799b917c5faf4bc15ec386679b88edeef14a2e6   43687:
 04899ce96db703acebf5c871664a21a1207ee148 v: v3

---
 [refs]                              |  2 +-
 trunk/include/asm-x86_64/ioctls.h   |  4 ++++
 trunk/include/asm-x86_64/termbits.h | 16 +++++++++++++++-
 trunk/include/asm-x86_64/termios.h  |  6 ++++--
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e1e520edba0b..62896c11edc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64bb6c5e1ddcd47c951740485026ef08975ee2e6
+refs/heads/master: 592ee3a5e5e2a981ef2829a0380093006d045661
diff --git a/trunk/include/asm-x86_64/ioctls.h b/trunk/include/asm-x86_64/ioctls.h
index 62caf8b6e4e1..3fc0b15a0d7e 100644
--- a/trunk/include/asm-x86_64/ioctls.h
+++ b/trunk/include/asm-x86_64/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 */
 
diff --git a/trunk/include/asm-x86_64/termbits.h b/trunk/include/asm-x86_64/termbits.h
index f31918cea510..6cfc3bb10c1a 100644
--- a/trunk/include/asm-x86_64/termbits.h
+++ b/trunk/include/asm-x86_64/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 */
@@ -129,6 +140,7 @@ struct ktermios {
 #define HUPCL	0002000
 #define CLOCAL	0004000
 #define CBAUDEX 0010000
+#define	   BOTHER 0010000		/* non standard rate */
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
@@ -144,10 +156,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	  8		/* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define ISIG	0000001
 #define ICANON	0000002
diff --git a/trunk/include/asm-x86_64/termios.h b/trunk/include/asm-x86_64/termios.h
index 041a91f7ddfb..443b225537f0 100644
--- a/trunk/include/asm-x86_64/termios.h
+++ b/trunk/include/asm-x86_64/termios.h
@@ -98,8 +98,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__ */