Signed-off-by: Alan Cox <[EMAIL PROTECTED]>
diff -u --new-file --recursive --exclude-from /usr/src/exclude
linux.vanilla-2.6.24-rc8-mm1/include/asm-parisc/ioctls.h
linux-2.6.24-rc8-mm1/include/asm-parisc/ioctls.h
--- linux.vanilla-2.6.24-rc8-mm1/include/asm-parisc/ioctls.h 2008-01-19
14:19:50.000000000 +0000
+++ linux-2.6.24-rc8-mm1/include/asm-parisc/ioctls.h 2008-01-19
15:07:16.000000000 +0000
@@ -46,6 +46,10 @@
#define TIOCSBRK 0x5427 /* BSD compatibility */
#define TIOCCBRK 0x5428 /* BSD compatibility */
#define TIOCGSID _IOR('T', 20, int) /* 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.24-rc8-mm1/include/asm-parisc/termbits.h
linux-2.6.24-rc8-mm1/include/asm-parisc/termbits.h
--- linux.vanilla-2.6.24-rc8-mm1/include/asm-parisc/termbits.h 2008-01-19
14:19:50.000000000 +0000
+++ linux-2.6.24-rc8-mm1/include/asm-parisc/termbits.h 2008-01-19
15:07:16.000000000 +0000
@@ -141,6 +141,7 @@
#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 @@
#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
diff -u --new-file --recursive --exclude-from /usr/src/exclude
linux.vanilla-2.6.24-rc8-mm1/include/asm-parisc/termios.h
linux-2.6.24-rc8-mm1/include/asm-parisc/termios.h
--- linux.vanilla-2.6.24-rc8-mm1/include/asm-parisc/termios.h 2008-01-19
14:19:50.000000000 +0000
+++ linux-2.6.24-rc8-mm1/include/asm-parisc/termios.h 2008-01-19
15:07:16.000000000 +0000
@@ -80,8 +80,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 /* __KERNEL__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
