diff options
| author | Jiri Slaby | 2012-03-05 14:52:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-03-08 21:30:50 +0100 |
| commit | 87758791c99715433841f1c054b49166506513e4 (patch) | |
| tree | a0ba9a0e5dea44992557fcd681077ee8ededb085 /include/linux/serialP.h | |
| parent | TTY: simserial, pass tty down to functions (diff) | |
| download | kernel-qcow2-linux-87758791c99715433841f1c054b49166506513e4.tar.gz kernel-qcow2-linux-87758791c99715433841f1c054b49166506513e4.tar.xz kernel-qcow2-linux-87758791c99715433841f1c054b49166506513e4.zip | |
TTY: amiserial/simserial, use tty_port
Add tty_port to serial_state and start using common tty port members
from tty_port in amiserial and simserial. The rest will follow one by
one.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/serialP.h')
| -rw-r--r-- | include/linux/serialP.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/serialP.h b/include/linux/serialP.h index 984f5ba8da4e..32d45b869cbc 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h @@ -23,6 +23,7 @@ #include <linux/workqueue.h> #include <linux/interrupt.h> #include <linux/circ_buf.h> +#include <linux/tty.h> #include <linux/wait.h> struct serial_state { @@ -38,6 +39,7 @@ struct serial_state { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ struct async_icount icount; + struct tty_port tport; /* amiserial */ int read_status_mask; @@ -46,14 +48,9 @@ struct serial_state { int quot; int IER; /* Interrupt Enable Register */ int MCR; /* Modem control register */ - wait_queue_head_t delta_msr_wait; /* simserial */ int x_char; /* xon/xoff character */ - int blocked_open; /* # of blocked opens */ struct circ_buf xmit; - wait_queue_head_t open_wait; - wait_queue_head_t close_wait; - struct tty_struct *tty; /* /simserial */ /* /amiserial */ }; |