From 68086977e056de9f2950dac377f48a4b020fb722 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@redhat.com>
Date: Wed, 16 Jul 2008 21:57:10 +0100
Subject: [PATCH] --- yaml --- r: 102376 b: refs/heads/master c:
 593573bc55c9e1999b9679da4e477c0220a6fbbd h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-avr32/ioctls.h | 4 ++++
 trunk/include/asm-frv/ioctls.h   | 4 ++++
 trunk/include/asm-frv/termbits.h | 5 ++++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5dc6bea2beb6..cf1ee152d1bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77451e53e0a509a98eda272567869cfe96431ba9
+refs/heads/master: 593573bc55c9e1999b9679da4e477c0220a6fbbd
diff --git a/trunk/include/asm-avr32/ioctls.h b/trunk/include/asm-avr32/ioctls.h
index 0500426b7186..0cf2c0a4502b 100644
--- a/trunk/include/asm-avr32/ioctls.h
+++ b/trunk/include/asm-avr32/ioctls.h
@@ -47,6 +47,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-frv/ioctls.h b/trunk/include/asm-frv/ioctls.h
index 341c7ddef2a3..d0c30e31fbda 100644
--- a/trunk/include/asm-frv/ioctls.h
+++ b/trunk/include/asm-frv/ioctls.h
@@ -47,6 +47,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-frv/termbits.h b/trunk/include/asm-frv/termbits.h
index 74851b424d4f..5568492b5086 100644
--- a/trunk/include/asm-frv/termbits.h
+++ b/trunk/include/asm-frv/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,11 +157,13 @@ 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 CTVB	  004000000000		/* VisioBraille Terminal flow control */
 #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