fix terminal control ioctl constants for sh

this commit changes the names to match the kernel names, exposing
under the normal names the "old" versions which work with a smaller
termios structure compatible with the userspace structure, and
renaming the "new" versions with "2" on the end like the kernel has.

this fixes spurious warnings "Unsupported ioctl: cmd=0x802c542a" from
qemu-sh4 and should be more correct anyway, since our userspace
termios structure does not have meaningful information in the part
which the kernel would be interpreting as speeds with the new ioctl.

diff --git a/arch/sh/bits/ioctl.h b/arch/sh/bits/ioctl.h
index c0b668b25dd32ec1f6475513b7fb641c0fd488d8..2f63d06fc15d86de29f230f11ea000218d52b254 100644 (file)
--- a/arch/sh/bits/ioctl.h
+++ b/arch/sh/bits/ioctl.h
@@ -81,10 +81,14 @@
 #define TIOCSBRK            _IO('T',  39)
 #define TIOCCBRK            _IO('T',  40)
 #define TIOCGSID            _IOR('T', 41, int)
-#define TCGETS              _IOR('T', 42, char[44])
-#define TCSETS              _IOW('T', 43, char[44])
-#define TCSETSW             _IOW('T', 44, char[44])
-#define TCSETSF             _IOW('T', 45, char[44])
+#define TCGETS              _IO('T', 1)
+#define TCSETS              _IO('T', 2)
+#define TCSETSW             _IO('T', 3)
+#define TCSETSF             _IO('T', 4)
+#define TCGETS2             _IOR('T', 42, char[44])
+#define TCSETS2             _IOW('T', 43, char[44])
+#define TCSETSW2            _IOW('T', 44, char[44])
+#define TCSETSF2            _IOW('T', 45, char[44])
 #define TIOCGPTN            _IOR('T', 48, unsigned int)
 #define TIOCSPTLCK          _IOW('T', 49, int)
 #define TIOCGDEV            _IOR('T', 50, unsigned int)