diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-12-08 05:38:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:56 -0500 |
commit | edc6afc5496875a640bef0913604be7550c1795d (patch) | |
tree | b05cd34a9a0d71edc9d6d7487ad551f0e15887b8 /include/linux/tty_ldisc.h | |
parent | be90038a24c814dc98bc5a813f41855779000018 (diff) |
[PATCH] tty: switch to ktermios and new framework
This is the core of the switch to the new framework. I've split it from the
driver patches which are mostly search/replace and would encourage people to
give this one a good hard stare.
The references to BOTHER and ISHIFT are the termios values that must be
defined by a platform once it wants to turn on "new style" ioctl support. The
code patches here ensure that providing
1. The termios overlays the ktermios in memory
2. The only new kernel only fields are c_ispeed/c_ospeed (or none)
the existing behaviour is retained. This is true for the patches at this
point in time.
Future patches will define BOTHER, ISHIFT and enable newer termios structures
for each architecture, and once they are all done some of the ifdefs also
vanish.
[akpm@osdl.org: warning fix]
[akpm@osdl.org: IRDA fix]
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/tty_ldisc.h')
-rw-r--r-- | include/linux/tty_ldisc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h index 83c6e6c10ebb..d75932e27710 100644 --- a/include/linux/tty_ldisc.h +++ b/include/linux/tty_ldisc.h | |||
@@ -59,7 +59,7 @@ | |||
59 | * low-level driver can "grab" an ioctl request before the line | 59 | * low-level driver can "grab" an ioctl request before the line |
60 | * discpline has a chance to see it. | 60 | * discpline has a chance to see it. |
61 | * | 61 | * |
62 | * void (*set_termios)(struct tty_struct *tty, struct termios * old); | 62 | * void (*set_termios)(struct tty_struct *tty, struct ktermios * old); |
63 | * | 63 | * |
64 | * This function notifies the line discpline that a change has | 64 | * This function notifies the line discpline that a change has |
65 | * been made to the termios structure. | 65 | * been made to the termios structure. |
@@ -118,7 +118,7 @@ struct tty_ldisc { | |||
118 | const unsigned char * buf, size_t nr); | 118 | const unsigned char * buf, size_t nr); |
119 | int (*ioctl)(struct tty_struct * tty, struct file * file, | 119 | int (*ioctl)(struct tty_struct * tty, struct file * file, |
120 | unsigned int cmd, unsigned long arg); | 120 | unsigned int cmd, unsigned long arg); |
121 | void (*set_termios)(struct tty_struct *tty, struct termios * old); | 121 | void (*set_termios)(struct tty_struct *tty, struct ktermios * old); |
122 | unsigned int (*poll)(struct tty_struct *, struct file *, | 122 | unsigned int (*poll)(struct tty_struct *, struct file *, |
123 | struct poll_table_struct *); | 123 | struct poll_table_struct *); |
124 | int (*hangup)(struct tty_struct *tty); | 124 | int (*hangup)(struct tty_struct *tty); |