diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-04-02 13:54:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-09 11:17:03 -0700 |
| commit | 042b9e7c2bef3bc2b250921fee0ae52125812643 (patch) | |
| tree | 1282c060ab8da29efde6656ecd257f34b9fe0a7a /drivers/isdn/i4l/isdn_tty.c | |
| parent | 4330d663fed02ace2feba1ab3795ab0c08148a28 (diff) | |
TTY: isdn, define tty_port_operations
Add there .carrier_raised. It is taken from current block_til_ready.
We will need tty_port->ops->carrier_raised for
tty_port_block_til_ready helper.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn/i4l/isdn_tty.c')
| -rw-r--r-- | drivers/isdn/i4l/isdn_tty.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index 50d7246b37a1..b41a80a453d7 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c @@ -1485,6 +1485,7 @@ isdn_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios) * isdn_tty_open() and friends * ------------------------------------------------------------ */ + static int isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info *info) { @@ -1552,7 +1553,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * break; } if (!(port->flags & ASYNC_CLOSING) && - (do_clocal || (info->msr & UART_MSR_DCD))) { + (do_clocal || tty_port_carrier_raised(port))) { break; } if (signal_pending(current)) { @@ -1848,6 +1849,16 @@ static const struct tty_operations modem_ops = { .tiocmset = isdn_tty_tiocmset, }; +static int isdn_tty_carrier_raised(struct tty_port *port) +{ + modem_info *info = container_of(port, modem_info, port); + return info->msr & UART_MSR_DCD; +} + +static const struct tty_port_operations isdn_tty_port_ops = { + .carrier_raised = isdn_tty_carrier_raised, +}; + int isdn_tty_modem_init(void) { @@ -1884,6 +1895,7 @@ isdn_tty_modem_init(void) } #endif tty_port_init(&info->port); + info->port.ops = &isdn_tty_port_ops; spin_lock_init(&info->readlock); sprintf(info->last_cause, "0000"); sprintf(info->last_num, "none"); |