iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers

Browse Source 
Signed-off-by: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Uwe Bonnes 2011-10-10 17:24:51 +02:00 committed by Greg Kroah-Hartman
parent 005b3cded7
commit 1d749f9afa
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/usb/serial/ftdi_sio.c
View File

@ -2328,6 +2328,8 @@ static int ftdi_ioctl(struct tty_struct *tty,
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct ftdi_private *priv = usb_get_serial_port_data(port); struct ftdi_private *priv = usb_get_serial_port_data(port);
struct async_icount cnow;
struct async_icount cprev;
dbg("%s cmd 0x%04x", __func__, cmd); dbg("%s cmd 0x%04x", __func__, cmd);
@ -2347,41 +2349,30 @@ static int ftdi_ioctl(struct tty_struct *tty,
* - mask passed in arg for lines of interest * - mask passed in arg for lines of interest
* (use |'ed TIOCM_RNG/DSR/CD/CTS for masking) * (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
* Caller should use TIOCGICOUNT to see which one it was. * Caller should use TIOCGICOUNT to see which one it was.
* (except that the driver doesn't support it !)
* *
* This code is borrowed from linux/drivers/char/serial.c * This code is borrowed from linux/drivers/char/serial.c
*/ */
case TIOCMIWAIT: case TIOCMIWAIT:
while (priv != NULL) { cprev = priv->icount;
while (1) {
interruptible_sleep_on(&priv->delta_msr_wait); interruptible_sleep_on(&priv->delta_msr_wait);
/* see if a signal did it */ /* see if a signal did it */
if (signal_pending(current)) if (signal_pending(current))
return -ERESTARTSYS; return -ERESTARTSYS;
else { cnow = priv->icount;
char diff = priv->diff_status; if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
if (diff == 0) return -EIO; /* no change => error */
return -EIO; /* no change => error */ if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
/* Consume all events */ ((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd)) ||
priv->diff_status = 0; ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) {
return 0;
/* Return 0 if caller wanted to know about
these bits */
if (((arg & TIOCM_RNG) && (diff & FTDI_RS0_RI)) ||
((arg & TIOCM_DSR) && (diff & FTDI_RS0_DSR)) ||
((arg & TIOCM_CD) && (diff & FTDI_RS0_RLSD)) ||
((arg & TIOCM_CTS) && (diff & FTDI_RS0_CTS))) {
return 0;
}
/*
* Otherwise caller can't care less about what
* happened,and so we continue to wait for more
* events.
*/
} }
cprev = cnow;
} }
return 0; /* not reached */
break;
case TIOCSERGETLSR: case TIOCSERGETLSR:
return get_lsr_info(port, (struct serial_struct __user *)arg); return get_lsr_info(port, (struct serial_struct __user *)arg);
break; break;