Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tty: riscom8: switch to the tty_port_open API

Browse source 
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2009-11-30 13:16:47 +00:00 committed by Greg Kroah-Hartman
parent 44e4909e45
commit 8f1e672344
1 changed files with 41 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
drivers/char/riscom8.c
View file

@ -793,26 +793,21 @@ static void rc_change_speed(struct tty_struct *tty, struct riscom_board *bp,
} }
/* Must be called with interrupts enabled */ /* Must be called with interrupts enabled */
static int rc_setup_port(struct tty_struct *tty, struct riscom_board *bp, static int rc_activate_port(struct tty_port *port, struct tty_struct *tty)
struct riscom_port *port)
{ {
struct riscom_port *rp = container_of(port, struct riscom_port, port);
struct riscom_board *bp = port_Board(rp);
unsigned long flags; unsigned long flags;
if (port->port.flags & ASYNC_INITIALIZED) if (tty_port_alloc_xmit_buf(port) < 0)
return 0;
if (tty_port_alloc_xmit_buf(&port->port) < 0)
return -ENOMEM; return -ENOMEM;
spin_lock_irqsave(&riscom_lock, flags); spin_lock_irqsave(&riscom_lock, flags);
clear_bit(TTY_IO_ERROR, &tty->flags); clear_bit(TTY_IO_ERROR, &tty->flags);
if (port->port.count == 1) bp->count++;
bp->count++; rp->xmit_cnt = rp->xmit_head = rp->xmit_tail = 0;
port->xmit_cnt = port->xmit_head = port->xmit_tail = 0; rc_change_speed(tty, bp, rp);
rc_change_speed(tty, bp, port);
port->port.flags |= ASYNC_INITIALIZED;
spin_unlock_irqrestore(&riscom_lock, flags); spin_unlock_irqrestore(&riscom_lock, flags);
return 0; return 0;
} }
@ -821,9 +816,6 @@ static int rc_setup_port(struct tty_struct *tty, struct riscom_board *bp,
static void rc_shutdown_port(struct tty_struct *tty, static void rc_shutdown_port(struct tty_struct *tty,
struct riscom_board *bp, struct riscom_port *port) struct riscom_board *bp, struct riscom_port *port)
{ {
if (!(port->port.flags & ASYNC_INITIALIZED))
return;
#ifdef RC_REPORT_OVERRUN #ifdef RC_REPORT_OVERRUN
printk(KERN_INFO "rc%d: port %d: Total %ld overruns were detected.\n", printk(KERN_INFO "rc%d: port %d: Total %ld overruns were detected.\n",
board_No(bp), port_No(port), port->overrun); board_No(bp), port_No(port), port->overrun);
@ -840,11 +832,6 @@ static void rc_shutdown_port(struct tty_struct *tty,
} }
#endif #endif
tty_port_free_xmit_buf(&port->port); tty_port_free_xmit_buf(&port->port);
if (C_HUPCL(tty)) {
/* Drop DTR */
bp->DTR |= (1u << port_No(port));
rc_out(bp, RC_DTR, bp->DTR);
}
/* Select port */ /* Select port */
rc_out(bp, CD180_CAR, port_No(port)); rc_out(bp, CD180_CAR, port_No(port));
@ -856,7 +843,6 @@ static void rc_shutdown_port(struct tty_struct *tty,
rc_out(bp, CD180_IER, port->IER); rc_out(bp, CD180_IER, port->IER);
set_bit(TTY_IO_ERROR, &tty->flags); set_bit(TTY_IO_ERROR, &tty->flags);
port->port.flags &= ~ASYNC_INITIALIZED;
if (--bp->count < 0) { if (--bp->count < 0) {
printk(KERN_INFO "rc%d: rc_shutdown_port: " printk(KERN_INFO "rc%d: rc_shutdown_port: "
@ -889,6 +875,20 @@ static int carrier_raised(struct tty_port *port)
return CD; return CD;
} }
static void dtr_rts(struct tty_port *port, int onoff)
{
struct riscom_port *p = container_of(port, struct riscom_port, port);
struct riscom_board *bp = port_Board(p);
unsigned long flags;
spin_lock_irqsave(&riscom_lock, flags);
bp->DTR &= ~(1u << port_No(p));
if (onoff == 0)
bp->DTR |= (1u << port_No(p));
rc_out(bp, RC_DTR, bp->DTR);
spin_unlock_irqrestore(&riscom_lock, flags);
}
static int rc_open(struct tty_struct *tty, struct file *filp) static int rc_open(struct tty_struct *tty, struct file *filp)
{ {
int board; int board;
@ -909,14 +909,7 @@ static int rc_open(struct tty_struct *tty, struct file *filp)
if (error) if (error)
return error; return error;
port->port.count++; return tty_port_open(&port->port, tty, filp);
tty->driver_data = port;
tty_port_tty_set(&port->port, tty);
error = rc_setup_port(tty, bp, port);
if (error == 0)
error = tty_port_block_til_ready(&port->port, tty, filp);
return error;
} }
static void rc_flush_buffer(struct tty_struct *tty) static void rc_flush_buffer(struct tty_struct *tty)
@ -950,24 +943,23 @@ static void rc_close_port(struct tty_port *port)
spin_lock_irqsave(&riscom_lock, flags); spin_lock_irqsave(&riscom_lock, flags);
rp->IER &= ~IER_RXD; rp->IER &= ~IER_RXD;
if (port->flags & ASYNC_INITIALIZED) {
rp->IER &= ~IER_TXRDY; rp->IER &= ~IER_TXRDY;
rp->IER |= IER_TXEMPTY; rp->IER |= IER_TXEMPTY;
rc_out(bp, CD180_CAR, port_No(rp)); rc_out(bp, CD180_CAR, port_No(rp));
rc_out(bp, CD180_IER, rp->IER); rc_out(bp, CD180_IER, rp->IER);
/* /*
* Before we drop DTR, make sure the UART transmitter * Before we drop DTR, make sure the UART transmitter
* has completely drained; this is especially * has completely drained; this is especially
* important if there is a transmit FIFO! * important if there is a transmit FIFO!
*/ */
timeout = jiffies + HZ; timeout = jiffies + HZ;
while (rp->IER & IER_TXEMPTY) { while (rp->IER & IER_TXEMPTY) {
spin_unlock_irqrestore(&riscom_lock, flags); spin_unlock_irqrestore(&riscom_lock, flags);
msleep_interruptible(jiffies_to_msecs(rp->timeout)); msleep_interruptible(jiffies_to_msecs(rp->timeout));
spin_lock_irqsave(&riscom_lock, flags); spin_lock_irqsave(&riscom_lock, flags);
if (time_after(jiffies, timeout)) if (time_after(jiffies, timeout))
break; break;
}
} }
rc_shutdown_port(port->tty, bp, rp); rc_shutdown_port(port->tty, bp, rp);
spin_unlock_irqrestore(&riscom_lock, flags); spin_unlock_irqrestore(&riscom_lock, flags);
@ -1354,7 +1346,6 @@ static void rc_hangup(struct tty_struct *tty)
if (rc_paranoia_check(port, tty->name, "rc_hangup")) if (rc_paranoia_check(port, tty->name, "rc_hangup"))
return; return;
rc_shutdown_port(tty, port_Board(port), port);
tty_port_hangup(&port->port); tty_port_hangup(&port->port);
} }
@ -1401,7 +1392,9 @@ static const struct tty_operations riscom_ops = {
static const struct tty_port_operations riscom_port_ops = { static const struct tty_port_operations riscom_port_ops = {
.carrier_raised = carrier_raised, .carrier_raised = carrier_raised,
.dtr_rts = dtr_rts,
.shutdown = rc_close_port, .shutdown = rc_close_port,
.activate = rc_activate_port,
}; };