github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

USB: gadget: f_accessory: Add ioctl to detect USB accessory attached at boot

Browse Source 
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood 2011-07-21 11:39:17 -07:00
parent fec502d9a1
commit adf0760ceb
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/gadget/f_accessory.c
View File

@ -75,6 +75,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;
@ -505,6 +508,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;
@ -572,6 +577,7 @@ static int acc_ctrlrequest(struct usb_composite_dev *cdev,
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;
@ -593,6 +599,7 @@ static int acc_ctrlrequest(struct usb_composite_dev *cdev,
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;
}
}
@ -624,6 +631,8 @@ acc_function_bind(struct usb_configuration *c, struct usb_function *f)
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)

2
include/linux/usb/f_accessory.h
View File

@ -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 */