diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-07-09 14:42:24 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-07-13 19:04:12 -0400 |
commit | 788b5f0834ea1566b931cf1ce8424027b3c4caf0 (patch) | |
tree | 5c1bd7d885cc15375240cdece7363136923ebf69 /include/asm-ia64 | |
parent | 51b58e3e26ebfb8cd56825c4b396ed251f51dec9 (diff) |
[IA64] arbitary speed tty ioctl support
Add the needed constants and defines to activate this for the IA64
platform.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/ioctls.h | 4 | ||||
-rw-r--r-- | include/asm-ia64/termbits.h | 5 | ||||
-rw-r--r-- | include/asm-ia64/termios.h | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/include/asm-ia64/ioctls.h b/include/asm-ia64/ioctls.h index 31ee521aeb7..f41b636a0bf 100644 --- a/include/asm-ia64/ioctls.h +++ b/include/asm-ia64/ioctls.h | |||
@@ -53,6 +53,10 @@ | |||
53 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | 53 | #define TIOCSBRK 0x5427 /* BSD compatibility */ |
54 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | 54 | #define TIOCCBRK 0x5428 /* BSD compatibility */ |
55 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | 55 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ |
56 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
57 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
58 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
59 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
56 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | 60 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ |
57 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | 61 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ |
58 | 62 | ||
diff --git a/include/asm-ia64/termbits.h b/include/asm-ia64/termbits.h index 7fae3109ef4..9f162e0089a 100644 --- a/include/asm-ia64/termbits.h +++ b/include/asm-ia64/termbits.h | |||
@@ -149,6 +149,7 @@ struct ktermios { | |||
149 | #define HUPCL 0002000 | 149 | #define HUPCL 0002000 |
150 | #define CLOCAL 0004000 | 150 | #define CLOCAL 0004000 |
151 | #define CBAUDEX 0010000 | 151 | #define CBAUDEX 0010000 |
152 | #define BOTHER 0010000 | ||
152 | #define B57600 0010001 | 153 | #define B57600 0010001 |
153 | #define B115200 0010002 | 154 | #define B115200 0010002 |
154 | #define B230400 0010003 | 155 | #define B230400 0010003 |
@@ -164,10 +165,12 @@ struct ktermios { | |||
164 | #define B3000000 0010015 | 165 | #define B3000000 0010015 |
165 | #define B3500000 0010016 | 166 | #define B3500000 0010016 |
166 | #define B4000000 0010017 | 167 | #define B4000000 0010017 |
167 | #define CIBAUD 002003600000 /* input baud rate (not used) */ | 168 | #define CIBAUD 002003600000 /* input baud rate */ |
168 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ | 169 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ |
169 | #define CRTSCTS 020000000000 /* flow control */ | 170 | #define CRTSCTS 020000000000 /* flow control */ |
170 | 171 | ||
172 | #define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ | ||
173 | |||
171 | /* c_lflag bits */ | 174 | /* c_lflag bits */ |
172 | #define ISIG 0000001 | 175 | #define ISIG 0000001 |
173 | #define ICANON 0000002 | 176 | #define ICANON 0000002 |
diff --git a/include/asm-ia64/termios.h b/include/asm-ia64/termios.h index 08750c2d360..689d218c0c2 100644 --- a/include/asm-ia64/termios.h +++ b/include/asm-ia64/termios.h | |||
@@ -87,8 +87,10 @@ struct termio { | |||
87 | copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ | 87 | copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ |
88 | }) | 88 | }) |
89 | 89 | ||
90 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios)) | 90 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) |
91 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios)) | 91 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) |
92 | #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios)) | ||
93 | #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios)) | ||
92 | 94 | ||
93 | # endif /* __KERNEL__ */ | 95 | # endif /* __KERNEL__ */ |
94 | 96 | ||