Re: [PATCH] tty: Turn on arbitary baud rate ioctls for i386 platform

Re: [PATCH] tty: Turn on arbitary baud rate ioctls for i386 platform

[Arjan van de Ven]

On Thu, 2007-03-08 at 14:44 +0000, Alan Cox wrote:
> Adds the needed TCGETS2/TCSETS2 ioctl calls, structures, defines and the
> like. Tested against the test suite and passes. Other platforms should need
> roughly the same change.


should this then really be in include/asm/* ? If everyone needs the same
change I'd think it should go into include/linux/* somewhere.
(if the answer is "the old ioctls were arch specific"... maybe the new
ones can fix that defect ;)

[PATCH] tty: Turn on arbitary baud rate ioctls for i386 platform

[Alan Cox]

Adds the needed TCGETS2/TCSETS2 ioctl calls, structures, defines and the
like. Tested against the test suite and passes. Other platforms should need
roughly the same change.

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

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc2-mm2/include/asm-i386/ioctls.h linux-2.6.21-rc2-mm2/include/asm-i386/ioctls.h
--- linux.vanilla-2.6.21-rc2-mm2/include/asm-i386/ioctls.h	2007-03-06 23:06:31.000000000 +0000
+++ linux-2.6.21-rc2-mm2/include/asm-i386/ioctls.h	2007-03-08 13:24:39.816743656 +0000
@@ -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 -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc2-mm2/include/asm-i386/termbits.h linux-2.6.21-rc2-mm2/include/asm-i386/termbits.h
--- linux.vanilla-2.6.21-rc2-mm2/include/asm-i386/termbits.h	2007-03-06 23:06:31.000000000 +0000
+++ linux-2.6.21-rc2-mm2/include/asm-i386/termbits.h	2007-03-07 15:45:32.000000000 +0000
@@ -17,6 +17,17 @@
 	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 @@
 #define HUPCL	0002000
 #define CLOCAL	0004000
 #define CBAUDEX 0010000
+#define   BOTHER  0010000
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc2-mm2/include/asm-i386/termios.h linux-2.6.21-rc2-mm2/include/asm-i386/termios.h
--- linux.vanilla-2.6.21-rc2-mm2/include/asm-i386/termios.h	2007-03-06 23:06:31.000000000 +0000
+++ linux-2.6.21-rc2-mm2/include/asm-i386/termios.h	2007-03-06 17:00:58.000000000 +0000
@@ -81,8 +81,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__ */
 

Re: [PATCH] tty: Turn on arbitary baud rate ioctls for i386 platform

[Andreas Schwab]

Arjan van de Ven <arjan@infradead.org> writes:

> should this then really be in include/asm/* ? If everyone needs the same
> change I'd think it should go into include/linux/* somewhere.

How about asm-generic/ioctls.h?  <asm/ioctls.h> is one of the few ABI
headers for glibc.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH] tty: Turn on arbitary baud rate ioctls for i386 platform

[Alan Cox]

On Thu, 08 Mar 2007 06:39:47 -0800
Arjan van de Ven <arjan@infradead.org> wrote:

> On Thu, 2007-03-08 at 14:44 +0000, Alan Cox wrote:
> > Adds the needed TCGETS2/TCSETS2 ioctl calls, structures, defines and the
> > like. Tested against the test suite and passes. Other platforms should need
> > roughly the same change.
> 
> 
> should this then really be in include/asm/* ? If everyone needs the same
> change I'd think it should go into include/linux/* somewhere.

It should be in include/asm. There are a whole range of different
variations of the structures and ioctl numbering in use on different
platforms so it does not trivially unify alas.

Alan