Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f79224ca2754e903b695bd91176a9bedbb306324

Authored by Alan Cox
Committed by Linus Torvalds
1 parent 17d8725d36
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

h8300: enable arbitary speed tty port setup 

Add the needed constants and defines to activate the new tty code on this
platform

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 12 additions and 3 deletions Side-by-side Diff

include/asm-h8300/ioctls.h
Diff comments   View file @ f79224c
... ... @@ -47,6 +47,10 @@
47 47 #define TIOCSBRK 0x5427 /* BSD compatibility */
48 48 #define TIOCCBRK 0x5428 /* BSD compatibility */
49 49 #define TIOCGSID 0x5429 /* Return the session ID of FD */
  50 +#define TCGETS2 _IOR('T',0x2A, struct termios2)
  51 +#define TCSETS2 _IOW('T',0x2B, struct termios2)
  52 +#define TCSETSW2 _IOW('T',0x2C, struct termios2)
  53 +#define TCSETSF2 _IOW('T',0x2D, struct termios2)
50 54 #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
51 55 #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
52 56  
include/asm-h8300/termbits.h
Diff comments   View file @ f79224c
... ... @@ -141,6 +141,7 @@
141 141 #define HUPCL 0002000
142 142 #define CLOCAL 0004000
143 143 #define CBAUDEX 0010000
  144 +#define BOTHER 0010000
144 145 #define B57600 0010001
145 146 #define B115200 0010002
146 147 #define B230400 0010003
147 148  
... ... @@ -156,9 +157,11 @@
156 157 #define B3000000 0010015
157 158 #define B3500000 0010016
158 159 #define B4000000 0010017
159   -#define CIBAUD 002003600000 /* input baud rate (not used) */
  160 +#define CIBAUD 002003600000 /* input baud rate */
160 161 #define CMSPAR 010000000000 /* mark or space (stick) parity */
161 162 #define CRTSCTS 020000000000 /* flow control */
  163 +
  164 +#define IBSHIFT 16 /* shift from CBAUD to CIBAUD */
162 165  
163 166 /* c_lflag bits */
164 167 #define ISIG 0000001
include/asm-h8300/termios.h
Diff comments   View file @ f79224c
... ... @@ -82,8 +82,10 @@
82 82 copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
83 83 })
84 84  
85   -#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
86   -#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
  85 +#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
  86 +#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
  87 +#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
  88 +#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
87 89  
88 90 #endif /* __KERNEL__ */
89 91