Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k: Enable arbitary speed tty support

Add the needed constants and defines to activate the existing code.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alan Cox and committed by
Linus Torvalds
a5f442b2 42b35923

+12 -3
+4
include/asm-m68k/ioctls.h
··· 46 46 #define TIOCSBRK 0x5427 /* BSD compatibility */ 47 47 #define TIOCCBRK 0x5428 /* BSD compatibility */ 48 48 #define TIOCGSID 0x5429 /* Return the session ID of FD */ 49 + #define TCGETS2 _IOR('T',0x2A, struct termios2) 50 + #define TCSETS2 _IOW('T',0x2B, struct termios2) 51 + #define TCSETSW2 _IOW('T',0x2C, struct termios2) 52 + #define TCSETSF2 _IOW('T',0x2D, struct termios2) 49 53 #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ 50 54 #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ 51 55
+4 -1
include/asm-m68k/termbits.h
··· 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 ··· 157 156 #define B3000000 0010015 158 157 #define B3500000 0010016 159 158 #define B4000000 0010017 160 - #define CIBAUD 002003600000 /* input baud rate (not used) */ 159 + #define CIBAUD 002003600000 /* input baud rate */ 161 160 #define CMSPAR 010000000000 /* mark or space (stick) parity */ 162 161 #define CRTSCTS 020000000000 /* flow control */ 162 + 163 + #define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ 163 164 164 165 /* c_lflag bits */ 165 166 #define ISIG 0000001
+4 -2
include/asm-m68k/termios.h
··· 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