summaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.h
diff options
context:
space:
mode:
authorOliver Neukum2009-05-16 21:13:19 +0200
committerGreg Kroah-Hartman2009-06-16 06:44:45 +0200
commita2bfb4a346d2c2e25f84b35c6044ff53296be1ee (patch)
tree494cea0b367252d248a73bd8fe2490d0539ac5f1 /drivers/usb/class/cdc-acm.h
parent+ drivers-usb-serial-sierrac-fix-printk-warning.patch added to -mm tree (diff)
downloadkernel-qcow2-linux-a2bfb4a346d2c2e25f84b35c6044ff53296be1ee.tar.gz
kernel-qcow2-linux-a2bfb4a346d2c2e25f84b35c6044ff53296be1ee.tar.xz
kernel-qcow2-linux-a2bfb4a346d2c2e25f84b35c6044ff53296be1ee.zip
USB: support for cdc-acm of single interface devices
This implement support in cdc-acm for acm devices another popular OS can handle - adds support for autodetection of devices that use one interface - autodetection of endpoints - add a quirk for surpressing a setting that OS doesn't use - autoassume that quirk for single interface devices Signed-off-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
-rw-r--r--drivers/usb/class/cdc-acm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 4c3856420add..1602324808ba 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -125,6 +125,7 @@ struct acm {
unsigned char clocal; /* termios CLOCAL */
unsigned int ctrl_caps; /* control capabilities from the class specific header */
unsigned int susp_count; /* number of suspended interfaces */
+ int combined_interfaces:1; /* control and data collapsed */
struct acm_wb *delayed_wb; /* write queued for a device about to be woken */
};
@@ -133,3 +134,4 @@ struct acm {
/* constants describing various quirks and errors */
#define NO_UNION_NORMAL 1
#define SINGLE_RX_URB 2
+#define NO_CAP_LINE 4