diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-06-28 16:19:32 -0400 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-09-29 17:49:39 -0700 |
| commit | 35ee07a4dffbfc40fffccd052d04040bd9f61d5d (patch) | |
| tree | ccbfaa676e5b1a36a0cc42aa9a2be8926ddb6504 /include/linux/usb | |
| parent | 1ee6838659398da8dda24d8f0d0965b025e01f96 (diff) | |
USB: composite: Add usb_composite_force_reset utility to force enumeration
Use this rather than calling usb_gadget_disconnect and usb_gadget_connect
directly to avoid sending USB disconnect events to userspace when resetting
the bus.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/composite.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index aa8f08b21e24..f491e48b21e6 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -39,6 +39,7 @@ #include <linux/switch.h> +struct usb_composite_dev; struct usb_configuration; /** @@ -143,6 +144,7 @@ int usb_function_activate(struct usb_function *); int usb_interface_id(struct usb_configuration *, struct usb_function *); void usb_function_set_enabled(struct usb_function *, int); +void usb_composite_force_reset(struct usb_composite_dev *); /** * ep_choose - select descriptor endpoint at current device speed @@ -356,6 +358,8 @@ struct usb_composite_dev { spinlock_t lock; struct switch_dev sdev; + /* used by usb_composite_force_reset to avoid signalling switch changes */ + bool mute_switch; struct work_struct switch_work; }; |