Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3abc1201 authored by Alan Cox's avatar Alan Cox Committed by Russell King
Browse files

[ARM] enable arbitary speed tty ioctls and split input/output speed 



Add the ioctls and values needed for this to the ARM26/ARM32 ports.  The
actual code has been in the base kernel for a while and automatically turns
on when a port sets the required defines.

[RMK: also added termbits.h changes to avoid build breakage]

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 43e7f6ad

include/asm-arm/ioctls.h

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,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 */

include/asm-arm/termbits.h

+15 −1
Original line number Diff line number Diff line
@@ -15,6 +15,17 @@ struct termios { 
	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 */
@@ -128,6 +139,7 @@ struct ktermios { 
#define HUPCL	0002000

#define CLOCAL	0004000

#define CBAUDEX 0010000

#define    BOTHER 0010000

#define    B57600 0010001

#define   B115200 0010002

#define   B230400 0010003
@@ -143,10 +155,12 @@ 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 CMSPAR    010000000000		/* mark or space (stick) parity */

#define CRTSCTS	  020000000000		/* flow control */



#define IBSHIFT	   16



/* c_lflag bits */

#define ISIG	0000001

#define ICANON	0000002

include/asm-arm/termios.h

+4 −2
Original line number Diff line number Diff line
@@ -82,8 +82,10 @@ struct termio { 
	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__ */