lkml.org 
[lkml]   [2012]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/69] TTY: isdn, define tty_port_operations
    Date
    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>
    ---
    drivers/isdn/i4l/isdn_tty.c | 14 +++++++++++++-
    1 file changed, 13 insertions(+), 1 deletion(-)

    diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
    index 50d7246..b41a80a 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");
    --
    1.7.9.2



    \
     
     \ /
      Last update: 2012-04-02 14:05    [W:3.432 / U:1.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site