Commit 8bc3372d9e57db3c65cf00cea6cf14969875b055
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
94da7d6f1f
Exists in
master
and in
7 other branches
ioctl: Use asm-generic/ioctls.h on cris (enables termiox)
This patch converts cris to use asm-generic/ioctls.h instead of its own version. The differences between the arch-specific version and the generic version are as follows: - CRIS defines two ioctls: TIOCSERSETRS485 and TIOCSERWRRS485, kept in arch-specific portion - CRIS defines a different value for TIOCSRS485, kept via ifndef in generic - The generic version adds support for termiox Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 2 changed files with 3 additions and 83 deletions Side-by-side Diff
arch/cris/include/asm/ioctls.h
| 1 | 1 | #ifndef __ARCH_CRIS_IOCTLS_H__ |
| 2 | 2 | #define __ARCH_CRIS_IOCTLS_H__ |
| 3 | 3 | |
| 4 | -/* verbatim copy of asm-i386/ioctls.h */ | |
| 5 | - | |
| 6 | -#include <asm/ioctl.h> | |
| 7 | - | |
| 8 | -/* 0x54 is just a magic number to make these relatively unique ('T') */ | |
| 9 | - | |
| 10 | -#define TCGETS 0x5401 | |
| 11 | -#define TCSETS 0x5402 | |
| 12 | -#define TCSETSW 0x5403 | |
| 13 | -#define TCSETSF 0x5404 | |
| 14 | -#define TCGETA 0x5405 | |
| 15 | -#define TCSETA 0x5406 | |
| 16 | -#define TCSETAW 0x5407 | |
| 17 | -#define TCSETAF 0x5408 | |
| 18 | -#define TCSBRK 0x5409 | |
| 19 | -#define TCXONC 0x540A | |
| 20 | -#define TCFLSH 0x540B | |
| 21 | -#define TIOCEXCL 0x540C | |
| 22 | -#define TIOCNXCL 0x540D | |
| 23 | -#define TIOCSCTTY 0x540E | |
| 24 | -#define TIOCGPGRP 0x540F | |
| 25 | -#define TIOCSPGRP 0x5410 | |
| 26 | -#define TIOCOUTQ 0x5411 | |
| 27 | -#define TIOCSTI 0x5412 | |
| 28 | -#define TIOCGWINSZ 0x5413 | |
| 29 | -#define TIOCSWINSZ 0x5414 | |
| 30 | -#define TIOCMGET 0x5415 | |
| 31 | -#define TIOCMBIS 0x5416 | |
| 32 | -#define TIOCMBIC 0x5417 | |
| 33 | -#define TIOCMSET 0x5418 | |
| 34 | -#define TIOCGSOFTCAR 0x5419 | |
| 35 | -#define TIOCSSOFTCAR 0x541A | |
| 36 | -#define FIONREAD 0x541B | |
| 37 | -#define TIOCINQ FIONREAD | |
| 38 | -#define TIOCLINUX 0x541C | |
| 39 | -#define TIOCCONS 0x541D | |
| 40 | -#define TIOCGSERIAL 0x541E | |
| 41 | -#define TIOCSSERIAL 0x541F | |
| 42 | -#define TIOCPKT 0x5420 | |
| 43 | -#define FIONBIO 0x5421 | |
| 44 | -#define TIOCNOTTY 0x5422 | |
| 45 | -#define TIOCSETD 0x5423 | |
| 46 | -#define TIOCGETD 0x5424 | |
| 47 | -#define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | |
| 48 | -#define TIOCSBRK 0x5427 /* BSD compatibility */ | |
| 49 | -#define TIOCCBRK 0x5428 /* BSD compatibility */ | |
| 50 | -#define TIOCGSID 0x5429 /* Return the session ID of FD */ | |
| 51 | -#define TCGETS2 _IOR('T',0x2A, struct termios2) | |
| 52 | -#define TCSETS2 _IOW('T',0x2B, struct termios2) | |
| 53 | -#define TCSETSW2 _IOW('T',0x2C, struct termios2) | |
| 54 | -#define TCSETSF2 _IOW('T',0x2D, struct termios2) | |
| 55 | -#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | |
| 56 | -#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | |
| 57 | -#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | |
| 58 | - | |
| 59 | -#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ | |
| 60 | -#define FIOCLEX 0x5451 | |
| 61 | -#define FIOASYNC 0x5452 | |
| 62 | -#define TIOCSERCONFIG 0x5453 | |
| 63 | -#define TIOCSERGWILD 0x5454 | |
| 64 | -#define TIOCSERSWILD 0x5455 | |
| 65 | -#define TIOCGLCKTRMIOS 0x5456 | |
| 66 | -#define TIOCSLCKTRMIOS 0x5457 | |
| 67 | 4 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ |
| 68 | -#define TIOCSERGETLSR 0x5459 /* Get line status register */ | |
| 69 | -#define TIOCSERGETMULTI 0x545A /* Get multiport config */ | |
| 70 | -#define TIOCSERSETMULTI 0x545B /* Set multiport config */ | |
| 71 | - | |
| 72 | -#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | |
| 73 | -#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | |
| 74 | -#define FIOQSIZE 0x5460 | |
| 75 | - | |
| 76 | 5 | #define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */ |
| 77 | 6 | #define TIOCSERWRRS485 0x5462 /* write rs-485 */ |
| 78 | 7 | #define TIOCSRS485 0x5463 /* enable rs-485 */ |
| 79 | -#define TIOCGRS485 0x542E /* get rs-485 */ | |
| 80 | 8 | |
| 81 | -/* Used for packet mode */ | |
| 82 | -#define TIOCPKT_DATA 0 | |
| 83 | -#define TIOCPKT_FLUSHREAD 1 | |
| 84 | -#define TIOCPKT_FLUSHWRITE 2 | |
| 85 | -#define TIOCPKT_STOP 4 | |
| 86 | -#define TIOCPKT_START 8 | |
| 87 | -#define TIOCPKT_NOSTOP 16 | |
| 88 | -#define TIOCPKT_DOSTOP 32 | |
| 89 | -#define TIOCPKT_IOCTL 64 | |
| 90 | - | |
| 91 | -#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | |
| 9 | +#include <asm-generic/ioctls.h> | |
| 92 | 10 | |
| 93 | 11 | #endif |
include/asm-generic/ioctls.h
| ... | ... | @@ -62,7 +62,9 @@ |
| 62 | 62 | #define TCSETSW2 _IOW('T', 0x2C, struct termios2) |
| 63 | 63 | #define TCSETSF2 _IOW('T', 0x2D, struct termios2) |
| 64 | 64 | #define TIOCGRS485 0x542E |
| 65 | +#ifndef TIOCSRS485 | |
| 65 | 66 | #define TIOCSRS485 0x542F |
| 67 | +#endif | |
| 66 | 68 | #define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ |
| 67 | 69 | #define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */ |
| 68 | 70 | #define TCGETX 0x5432 /* SYS5 TCGETX compatibility */ |