summaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.h
diff options
context:
space:
mode:
authorOliver Neukum2013-11-20 11:35:34 +0100
committerGreg Kroah-Hartman2013-12-03 19:23:46 +0100
commit5a6a62bdb9257aa74ab0ad2b2c8a33b0f9b17ce4 (patch)
treec39408f8477c5332d5aaadd0ee9c275eb03f5ffe /drivers/usb/class/cdc-acm.h
parentusb: chipidea: remove DEFINE_PCI_DEVICE_TABLE macro (diff)
downloadkernel-qcow2-linux-5a6a62bdb9257aa74ab0ad2b2c8a33b0f9b17ce4.tar.gz
kernel-qcow2-linux-5a6a62bdb9257aa74ab0ad2b2c8a33b0f9b17ce4.tar.xz
kernel-qcow2-linux-5a6a62bdb9257aa74ab0ad2b2c8a33b0f9b17ce4.zip
cdc-acm: add TIOCMIWAIT
This implements TIOCMIWAIT for TIOCM_DSR, TIOCM_RI and TIOCM_CD Disconnect is handled as TIOCM_CD or an error. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
-rw-r--r--drivers/usb/class/cdc-acm.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 0f76e4af600e..e38dc785808f 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -106,6 +106,9 @@ struct acm {
struct work_struct work; /* work queue entry for line discipline waking up */
unsigned int ctrlin; /* input control lines (DCD, DSR, RI, break, overruns) */
unsigned int ctrlout; /* output control lines (DTR, RTS) */
+ struct async_icount iocount; /* counters for control line changes */
+ struct async_icount oldcount; /* for comparison of counter */
+ wait_queue_head_t wioctl; /* for ioctl */
unsigned int writesize; /* max packet size for the output bulk endpoint */
unsigned int readsize,ctrlsize; /* buffer sizes for freeing */
unsigned int minor; /* acm minor number */