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

Signed-off-by: Mike Lockwood <lockwood@android.com>

diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c
index 873ab2ed991e4122b6ee937f4d026769595a1cae..05e65e5cd70424fdc02e3401a31d8146cf774a32 100644 (file)
--- a/drivers/usb/gadget/f_accessory.c
+++ b/drivers/usb/gadget/f_accessory.c
@@ -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)

diff --git a/include/linux/usb/f_accessory.h b/include/linux/usb/f_accessory.h
index ebcc5f34f554dd7230f539103cf54fac55654045..5b2dcf9728e1065d3ef0eb1089a6794656286ec3 100644 (file)
--- 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 */