diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-12-08 05:38:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:57 -0500 |
commit | 606d099cdd1080bbb50ea50dc52d98252f8f10a1 (patch) | |
tree | 80d17450a5fb78effce3f4312f672c058658e004 /drivers/char/amiserial.c | |
parent | edc6afc5496875a640bef0913604be7550c1795d (diff) |
[PATCH] tty: switch to ktermios
This is the grungy swap all the occurrences in the right places patch that
goes with the updates. At this point we have the same functionality as
before (except that sgttyb() returns speeds not zero) and are ready to
begin turning new stuff on providing nobody reports lots of bugs
If you are a tty driver author converting an out of tree driver the only
impact should be termios->ktermios name changes for the speed/property
setting functions from your upper layers.
If you are implementing your own TCGETS function before then your driver
was broken already and its about to get a whole lot more painful for you so
please fix it 8)
Also fill in c_ispeed/ospeed on init for most devices, although the current
code will do this for you anyway but I'd like eventually to lose that extra
paranoia
[akpm@osdl.org: bluetooth fix]
[mp3@de.ibm.com: sclp fix]
[mp3@de.ibm.com: warning fix for tty3270]
[hugh@veritas.com: fix tty_ioctl powerpc build]
[jdike@addtoit.com: uml: fix ->set_termios declaration]
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Martin Peschke <mp3@de.ibm.com>
Acked-by: Peter Oberparleiter <oberpar@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/amiserial.c')
-rw-r--r-- | drivers/char/amiserial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 66086fa2d59a..feb4ac802a0d 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
@@ -104,7 +104,7 @@ static struct async_struct *IRQ_ports; | |||
104 | 104 | ||
105 | static unsigned char current_ctl_bits; | 105 | static unsigned char current_ctl_bits; |
106 | 106 | ||
107 | static void change_speed(struct async_struct *info, struct termios *old); | 107 | static void change_speed(struct async_struct *info, struct ktermios *old); |
108 | static void rs_wait_until_sent(struct tty_struct *tty, int timeout); | 108 | static void rs_wait_until_sent(struct tty_struct *tty, int timeout); |
109 | 109 | ||
110 | 110 | ||
@@ -694,7 +694,7 @@ static void shutdown(struct async_struct * info) | |||
694 | * the specified baud rate for a serial port. | 694 | * the specified baud rate for a serial port. |
695 | */ | 695 | */ |
696 | static void change_speed(struct async_struct *info, | 696 | static void change_speed(struct async_struct *info, |
697 | struct termios *old_termios) | 697 | struct ktermios *old_termios) |
698 | { | 698 | { |
699 | int quot = 0, baud_base, baud; | 699 | int quot = 0, baud_base, baud; |
700 | unsigned cflag, cval = 0; | 700 | unsigned cflag, cval = 0; |
@@ -1365,7 +1365,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, | |||
1365 | return 0; | 1365 | return 0; |
1366 | } | 1366 | } |
1367 | 1367 | ||
1368 | static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios) | 1368 | static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) |
1369 | { | 1369 | { |
1370 | struct async_struct *info = (struct async_struct *)tty->driver_data; | 1370 | struct async_struct *info = (struct async_struct *)tty->driver_data; |
1371 | unsigned long flags; | 1371 | unsigned long flags; |