diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-12-10 16:30:15 -0800 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-12-14 09:24:54 -0800 |
| commit | a05f03bf6ece7619877d6b3ccfbc7597f6df7b40 (patch) | |
| tree | 63c2e44bc26739545d37e2847e4212364044e8e6 /include | |
| parent | 1cfb26afa1528c3c148f59aa0f6764d77c02659a (diff) | |
USB: gadget: composite: Use separate switches for connected and config state
Also remove disconnect debouncing, which didn't actually work on some platforms
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/composite.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index f491e48b21e6..cb28d4302781 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -357,9 +357,13 @@ struct usb_composite_dev { /* protects at least deactivation count */ spinlock_t lock; - struct switch_dev sdev; - /* used by usb_composite_force_reset to avoid signalling switch changes */ - bool mute_switch; + /* switch indicating connected/disconnected state */ + struct switch_dev sw_connected; + /* switch indicating current configuration */ + struct switch_dev sw_config; + /* current connected state for sw_connected */ + bool connected; + struct work_struct switch_work; }; |