diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-06-23 08:20:59 -0400 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:07 -0700 |
| commit | e2dc503c4220b7d86815283f7d18c0b14af64470 (patch) | |
| tree | 86b791420885196c018cc05bd527d5996762d976 /drivers/usb/gadget/android.c | |
| parent | 0de5a69f62827cbf1cf4a254811aab65200e5a2d (diff) | |
| download | kernel_samsung_aries-e2dc503c4220b7d86815283f7d18c0b14af64470.zip kernel_samsung_aries-e2dc503c4220b7d86815283f7d18c0b14af64470.tar.gz kernel_samsung_aries-e2dc503c4220b7d86815283f7d18c0b14af64470.tar.bz2 | |
USB: gadget: composite: Add userspace notifications for USB state changes
Add switch to notify current USB configuration. This can be used to detect
USB connect and disconnect events.
Broadcast a change via the usb_composite class when a USB function is
enabled or disabled.
Rename usb_function.hidden to usb_function.disabled.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'drivers/usb/gadget/android.c')
| -rw-r--r-- | drivers/usb/gadget/android.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 3c4d44d..6e3c32e 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -208,7 +208,7 @@ static int product_matches_functions(struct android_usb_product *p) { struct usb_function *f; list_for_each_entry(f, &android_config_driver.functions, list) { - if (product_has_function(p, f) == !!f->hidden) + if (product_has_function(p, f) == !!f->disabled) return 0; } return 1; @@ -323,8 +323,8 @@ void android_enable_function(struct usb_function *f, int enable) int disable = !enable; int product_id; - if (!!f->hidden != disable) { - f->hidden = disable; + if (!!f->disabled != disable) { + usb_function_set_enabled(f, !disable); #ifdef CONFIG_USB_ANDROID_RNDIS if (!strcmp(f->name, "rndis")) { @@ -347,7 +347,7 @@ void android_enable_function(struct usb_function *f, int enable) */ list_for_each_entry(func, &android_config_driver.functions, list) { if (!strcmp(func->name, "usb_mass_storage")) { - func->hidden = enable; + usb_function_set_enabled(f, !enable); break; } } |