[PATCH] tty: Add the new ioctls and definitionto the MIPS architecture

[PATCH] tty: Add the new ioctls and definitionto the MIPS architecture

[Alan Cox]

Same as all the others, just put in the constants for the existing kernel
code and termios2 structure

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc4-mm2/include/asm-mips/ioctls.h linux-2.6.22-rc4-mm2/include/asm-mips/ioctls.h
--- linux.vanilla-2.6.22-rc4-mm2/include/asm-mips/ioctls.h	2007-06-07 14:24:30.000000000 +0100
+++ linux-2.6.22-rc4-mm2/include/asm-mips/ioctls.h	2007-06-07 14:36:17.000000000 +0100
@@ -77,6 +77,10 @@
 #define TIOCSBRK	0x5427  /* BSD compatibility */
 #define TIOCCBRK	0x5428  /* BSD compatibility */
 #define TIOCGSID	0x7416  /* 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 -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc4-mm2/include/asm-mips/termbits.h linux-2.6.22-rc4-mm2/include/asm-mips/termbits.h
--- linux.vanilla-2.6.22-rc4-mm2/include/asm-mips/termbits.h	2007-06-07 14:26:10.000000000 +0100
+++ linux-2.6.22-rc4-mm2/include/asm-mips/termbits.h	2007-06-07 14:36:36.000000000 +0100
@@ -164,6 +164,7 @@
 #define HUPCL	0002000		/* Hang up on last close.  */
 #define CLOCAL	0004000		/* Ignore modem status lines.  */
 #define CBAUDEX 0010000
+#define    BOTHER 0010000
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
@@ -179,9 +180,11 @@
 #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 CRTSCTS	  020000000000	/* flow control */
+
+#define IBSHIFT	16		/* Shift from CBAUD to CIBAUD */
 
 /* c_lflag bits */
 #define ISIG	0000001		/* Enable signals.  */
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc4-mm2/include/asm-mips/termios.h linux-2.6.22-rc4-mm2/include/asm-mips/termios.h
--- linux.vanilla-2.6.22-rc4-mm2/include/asm-mips/termios.h	2007-06-07 14:24:30.000000000 +0100
+++ linux-2.6.22-rc4-mm2/include/asm-mips/termios.h	2007-06-07 14:36:36.000000000 +0100
@@ -122,8 +122,10 @@
 	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 /* defined(__KERNEL__) */
 

Re: [PATCH] tty: Add the new ioctls and definitionto the MIPS architecture

[Ralf Baechle]

On Thu, Jun 07, 2007 at 04:25:55PM +0100, Alan Cox wrote:

> Same as all the others, just put in the constants for the existing kernel
> code and termios2 structure
> 
> Signed-off-by: Alan Cox <alan@redhat.com>

Acked-by: Ralf Baechle <ralf@linux-mips.org>

  Ralf