diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-09-20 17:56:45 -0700 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2011-09-20 17:57:55 -0700 |
| commit | 7c12d243006cc806b40587a06695ea122dceac83 (patch) | |
| tree | fd868ed80fb20d12b55d9d31841b946e0ef84b81 | |
| parent | 70482d9859db1bd1b0ad8bb58848818325f74837 (diff) | |
USB: gadget: f_accessory: Add ioctl to detect USB accessory attached at boot
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge conflict resolve
Change-Id: Iae7ec796ef5361ec3c58ba687b023b42e1049b90
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| -rw-r--r-- | drivers/usb/gadget/f_accessory.c | 9 | ||||
| -rw-r--r-- | include/linux/usb/f_accessory.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c index ad3c1738336..d8754870fca 100644 --- a/drivers/usb/gadget/f_accessory.c +++ b/drivers/usb/gadget/f_accessory.c @@ -76,6 +76,9 @@ struct acc_dev { /* for acc_complete_set_string */ int string_index; + /* set to 1 if we have a pending start request */ + int start_requested; + /* synchronize access to our device file */ atomic_t open_excl; @@ -512,6 +515,8 @@ static long acc_ioctl(struct file *fp, unsigned code, unsigned long value) case ACCESSORY_GET_STRING_SERIAL: src = dev->serial; break; + case ACCESSORY_IS_START_REQUESTED: + return dev->start_requested; } if (!src) return -EINVAL; @@ -569,6 +574,8 @@ acc_function_bind(struct usb_configuration *c, struct usb_function *f) dev->cdev = cdev; DBG(cdev, "acc_function_bind dev: %p\n", dev); + dev->start_requested = 0; + /* allocate interface ID(s) */ id = usb_interface_id(c, f); if (id < 0) @@ -645,6 +652,7 @@ static int acc_function_setup(struct usb_function *f, if (dev->function.disabled) { if (b_requestType == (USB_DIR_OUT | USB_TYPE_VENDOR)) { if (b_request == ACCESSORY_START) { + dev->start_requested = 1; schedule_delayed_work( &dev->work, msecs_to_jiffies(10)); value = 0; @@ -666,6 +674,7 @@ static int acc_function_setup(struct usb_function *f, memset(dev->version, 0, sizeof(dev->version)); memset(dev->uri, 0, sizeof(dev->uri)); memset(dev->serial, 0, sizeof(dev->serial)); + dev->start_requested = 0; } } } diff --git a/include/linux/usb/f_accessory.h b/include/linux/usb/f_accessory.h index ebcc5f34f55..5b2dcf9728e 100644 --- a/include/linux/usb/f_accessory.h +++ b/include/linux/usb/f_accessory.h @@ -77,5 +77,7 @@ #define ACCESSORY_GET_STRING_VERSION _IOW('M', 4, char[256]) #define ACCESSORY_GET_STRING_URI _IOW('M', 5, char[256]) #define ACCESSORY_GET_STRING_SERIAL _IOW('M', 6, char[256]) +/* returns 1 if there is a start request pending */ +#define ACCESSORY_IS_START_REQUESTED _IO('M', 7) #endif /* __LINUX_USB_F_ACCESSORY_H */ |