usb: gadget: android: Update android gadget driver
* Functions and the device descriptor are configured from user space:
echo 0 > /sys/class/android_usb/android0/enable
echo adb,acm > /sys/class/android_usb/android0/functions
echo 2 > /sys/class/android_usb/android0/f_acm/instances
echo 1 > /sys/class/android_usb/android0/enable
* Driver does not require platform data anymore
* Moved function initialization to android.c instead of each
function file
* Replaced switches by uevents
Signed-off-by: Benoit Goby <benoit@android.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Change-Id: If5ad9267c111ad0a442f0d87a0d31082dc5381b6
diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c
index ad3c173..873ab2e 100644
--- a/drivers/usb/gadget/f_accessory.c
+++ b/drivers/usb/gadget/f_accessory.c
@@ -35,7 +35,6 @@
#include <linux/usb.h>
#include <linux/usb/ch9.h>
-#include <linux/usb/android_composite.h>
#include <linux/usb/f_accessory.h>
#define BULK_BUFFER_SIZE 16384
@@ -249,12 +248,11 @@
static void acc_complete_set_string(struct usb_ep *ep, struct usb_request *req)
{
struct acc_dev *dev = ep->driver_data;
- struct usb_composite_dev *cdev = dev->cdev;
char *string_dest = NULL;
int length = req->actual;
if (req->status != 0) {
- DBG(cdev, "acc_complete_set_string, err %d\n", req->status);
+ pr_err("acc_complete_set_string, err %d\n", req->status);
return;
}
@@ -285,12 +283,12 @@
length = ACC_STRING_SIZE - 1;
spin_lock_irqsave(&dev->lock, flags);
- memcpy(string_dest, cdev->req->buf, length);
+ memcpy(string_dest, req->buf, length);
/* ensure zero termination */
string_dest[length] = 0;
spin_unlock_irqrestore(&dev->lock, flags);
} else {
- DBG(cdev, "unknown accessory string index %d\n",
+ pr_err("unknown accessory string index %d\n",
dev->string_index);
}
}
@@ -364,12 +362,11 @@
size_t count, loff_t *pos)
{
struct acc_dev *dev = fp->private_data;
- struct usb_composite_dev *cdev = dev->cdev;
struct usb_request *req;
int r = count, xfer;
int ret = 0;
- DBG(cdev, "acc_read(%d)\n", count);
+ pr_debug("acc_read(%d)\n", count);
if (dev->disconnected)
return -ENODEV;
@@ -378,7 +375,7 @@
count = BULK_BUFFER_SIZE;
/* we will block until we're online */
- DBG(cdev, "acc_read: waiting for online\n");
+ pr_debug("acc_read: waiting for online\n");
ret = wait_event_interruptible(dev->read_wq, dev->online);
if (ret < 0) {
r = ret;
@@ -395,7 +392,7 @@
r = -EIO;
goto done;
} else {
- DBG(cdev, "rx %p queue\n", req);
+ pr_debug("rx %p queue\n", req);
}
/* wait for a request to complete */
@@ -410,7 +407,7 @@
if (req->actual == 0)
goto requeue_req;
- DBG(cdev, "rx %p %d\n", req, req->actual);
+ pr_debug("rx %p %d\n", req, req->actual);
xfer = (req->actual < count) ? req->actual : count;
r = xfer;
if (copy_to_user(buf, req->buf, xfer))
@@ -419,7 +416,7 @@
r = -EIO;
done:
- DBG(cdev, "acc_read returning %d\n", r);
+ pr_debug("acc_read returning %d\n", r);
return r;
}
@@ -427,19 +424,18 @@
size_t count, loff_t *pos)
{
struct acc_dev *dev = fp->private_data;
- struct usb_composite_dev *cdev = dev->cdev;
struct usb_request *req = 0;
int r = count, xfer;
int ret;
- DBG(cdev, "acc_write(%d)\n", count);
+ pr_debug("acc_write(%d)\n", count);
if (!dev->online || dev->disconnected)
return -ENODEV;
while (count > 0) {
if (!dev->online) {
- DBG(cdev, "acc_write dev->error\n");
+ pr_debug("acc_write dev->error\n");
r = -EIO;
break;
}
@@ -465,7 +461,7 @@
req->length = xfer;
ret = usb_ep_queue(dev->ep_in, req, GFP_KERNEL);
if (ret < 0) {
- DBG(cdev, "acc_write: xfer error %d\n", ret);
+ pr_debug("acc_write: xfer error %d\n", ret);
r = -EIO;
break;
}
@@ -480,7 +476,7 @@
if (req)
req_put(dev, &dev->tx_idle, req);
- DBG(cdev, "acc_write returning %d\n", r);
+ pr_debug("acc_write returning %d\n", r);
return r;
}
@@ -490,9 +486,6 @@
char *src = NULL;
int ret;
- if (dev->function.disabled)
- return -ENODEV;
-
switch (code) {
case ACCESSORY_GET_STRING_MANUFACTURER:
src = dev->manufacturer;
@@ -558,6 +551,69 @@
.fops = &acc_fops,
};
+
+static int acc_ctrlrequest(struct usb_composite_dev *cdev,
+ const struct usb_ctrlrequest *ctrl)
+{
+ struct acc_dev *dev = _acc_dev;
+ int value = -EOPNOTSUPP;
+ u8 b_requestType = ctrl->bRequestType;
+ u8 b_request = ctrl->bRequest;
+ u16 w_index = le16_to_cpu(ctrl->wIndex);
+ u16 w_value = le16_to_cpu(ctrl->wValue);
+ u16 w_length = le16_to_cpu(ctrl->wLength);
+
+/*
+ printk(KERN_INFO "acc_ctrlrequest "
+ "%02x.%02x v%04x i%04x l%u\n",
+ b_requestType, b_request,
+ w_value, w_index, w_length);
+*/
+
+ if (b_requestType == (USB_DIR_OUT | USB_TYPE_VENDOR)) {
+ if (b_request == ACCESSORY_START) {
+ schedule_delayed_work(
+ &dev->work, msecs_to_jiffies(10));
+ value = 0;
+ } else if (b_request == ACCESSORY_SEND_STRING) {
+ dev->string_index = w_index;
+ cdev->gadget->ep0->driver_data = dev;
+ cdev->req->complete = acc_complete_set_string;
+ value = w_length;
+ }
+ } else if (b_requestType == (USB_DIR_IN | USB_TYPE_VENDOR)) {
+ if (b_request == ACCESSORY_GET_PROTOCOL) {
+ *((u16 *)cdev->req->buf) = PROTOCOL_VERSION;
+ value = sizeof(u16);
+
+ /* clear any strings left over from a previous session */
+ memset(dev->manufacturer, 0, sizeof(dev->manufacturer));
+ memset(dev->model, 0, sizeof(dev->model));
+ memset(dev->description, 0, sizeof(dev->description));
+ memset(dev->version, 0, sizeof(dev->version));
+ memset(dev->uri, 0, sizeof(dev->uri));
+ memset(dev->serial, 0, sizeof(dev->serial));
+ }
+ }
+
+ if (value >= 0) {
+ cdev->req->zero = 0;
+ cdev->req->length = value;
+ value = usb_ep_queue(cdev->gadget->ep0, cdev->req, GFP_ATOMIC);
+ if (value < 0)
+ ERROR(cdev, "%s setup response queue error\n",
+ __func__);
+ }
+
+ if (value == -EOPNOTSUPP)
+ VDBG(cdev,
+ "unknown class-specific control req "
+ "%02x.%02x v%04x i%04x l%u\n",
+ ctrl->bRequestType, ctrl->bRequest,
+ w_value, w_index, w_length);
+ return value;
+}
+
static int
acc_function_bind(struct usb_configuration *c, struct usb_function *f)
{
@@ -566,7 +622,6 @@
int id;
int ret;
- dev->cdev = cdev;
DBG(cdev, "acc_function_bind dev: %p\n", dev);
/* allocate interface ID(s) */
@@ -602,90 +657,16 @@
struct usb_request *req;
int i;
- spin_lock_irq(&dev->lock);
while ((req = req_get(dev, &dev->tx_idle)))
acc_request_free(req, dev->ep_in);
for (i = 0; i < RX_REQ_MAX; i++)
acc_request_free(dev->rx_req[i], dev->ep_out);
- dev->online = 0;
- spin_unlock_irq(&dev->lock);
-
- misc_deregister(&acc_device);
- kfree(_acc_dev);
- _acc_dev = NULL;
}
static void acc_work(struct work_struct *data)
{
- struct delayed_work *delayed = to_delayed_work(data);
- struct acc_dev *dev =
- container_of(delayed, struct acc_dev, work);
- android_enable_function(&dev->function, 1);
-}
-
-static int acc_function_setup(struct usb_function *f,
- const struct usb_ctrlrequest *ctrl)
-{
- struct acc_dev *dev = func_to_dev(f);
- struct usb_composite_dev *cdev = dev->cdev;
- int value = -EOPNOTSUPP;
- u8 b_requestType = ctrl->bRequestType;
- u8 b_request = ctrl->bRequest;
- u16 w_index = le16_to_cpu(ctrl->wIndex);
- u16 w_value = le16_to_cpu(ctrl->wValue);
- u16 w_length = le16_to_cpu(ctrl->wLength);
-
-/*
- printk(KERN_INFO "acc_function_setup "
- "%02x.%02x v%04x i%04x l%u\n",
- b_requestType, b_request,
- w_value, w_index, w_length);
-*/
-
- if (dev->function.disabled) {
- if (b_requestType == (USB_DIR_OUT | USB_TYPE_VENDOR)) {
- if (b_request == ACCESSORY_START) {
- schedule_delayed_work(
- &dev->work, msecs_to_jiffies(10));
- value = 0;
- } else if (b_request == ACCESSORY_SEND_STRING) {
- dev->string_index = w_index;
- cdev->gadget->ep0->driver_data = dev;
- cdev->req->complete = acc_complete_set_string;
- value = w_length;
- }
- } else if (b_requestType == (USB_DIR_IN | USB_TYPE_VENDOR)) {
- if (b_request == ACCESSORY_GET_PROTOCOL) {
- *((u16 *)cdev->req->buf) = PROTOCOL_VERSION;
- value = sizeof(u16);
-
- /* clear any strings left over from a previous session */
- memset(dev->manufacturer, 0, sizeof(dev->manufacturer));
- memset(dev->model, 0, sizeof(dev->model));
- memset(dev->description, 0, sizeof(dev->description));
- memset(dev->version, 0, sizeof(dev->version));
- memset(dev->uri, 0, sizeof(dev->uri));
- memset(dev->serial, 0, sizeof(dev->serial));
- }
- }
- }
-
- if (value >= 0) {
- cdev->req->zero = 0;
- cdev->req->length = value;
- value = usb_ep_queue(cdev->gadget->ep0, cdev->req, GFP_ATOMIC);
- if (value < 0)
- ERROR(cdev, "%s setup response queue error\n",
- __func__);
- }
-
- if (value == -EOPNOTSUPP)
- VDBG(cdev,
- "unknown class-specific control req "
- "%02x.%02x v%04x i%04x l%u\n",
- ctrl->bRequestType, ctrl->bRequest,
- w_value, w_index, w_length);
- return value;
+ char *envp[2] = { "ACCESSORY=START", NULL };
+ kobject_uevent_env(&acc_device.this_device->kobj, KOBJ_CHANGE, envp);
}
static int acc_function_set_alt(struct usb_function *f,
@@ -710,8 +691,8 @@
usb_ep_disable(dev->ep_in);
return ret;
}
- if (!dev->function.disabled)
- dev->online = 1;
+
+ dev->online = 1;
/* readers may be blocked waiting for us to go online */
wake_up(&dev->read_wq);
@@ -736,15 +717,11 @@
static int acc_bind_config(struct usb_configuration *c)
{
- struct acc_dev *dev;
+ struct acc_dev *dev = _acc_dev;
int ret;
printk(KERN_INFO "acc_bind_config\n");
- dev = kzalloc(sizeof(*dev), GFP_KERNEL);
- if (!dev)
- return -ENOMEM;
-
/* allocate a string ID for our interface */
if (acc_string_defs[INTERFACE_STRING_INDEX].id == 0) {
ret = usb_string_id(c->cdev);
@@ -754,13 +731,6 @@
acc_interface_desc.iInterface = ret;
}
- spin_lock_init(&dev->lock);
- init_waitqueue_head(&dev->read_wq);
- init_waitqueue_head(&dev->write_wq);
- atomic_set(&dev->open_excl, 0);
- INIT_LIST_HEAD(&dev->tx_idle);
- INIT_DELAYED_WORK(&dev->work, acc_work);
-
dev->cdev = c->cdev;
dev->function.name = "accessory";
dev->function.strings = acc_strings,
@@ -768,41 +738,46 @@
dev->function.hs_descriptors = hs_acc_descs;
dev->function.bind = acc_function_bind;
dev->function.unbind = acc_function_unbind;
- dev->function.setup = acc_function_setup;
dev->function.set_alt = acc_function_set_alt;
dev->function.disable = acc_function_disable;
- dev->function.disabled = 1;
+
+ return usb_add_function(c, &dev->function);
+}
+
+static int acc_setup(void)
+{
+ struct acc_dev *dev;
+ int ret;
+
+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+ if (!dev)
+ return -ENOMEM;
+
+ spin_lock_init(&dev->lock);
+ init_waitqueue_head(&dev->read_wq);
+ init_waitqueue_head(&dev->write_wq);
+ atomic_set(&dev->open_excl, 0);
+ INIT_LIST_HEAD(&dev->tx_idle);
+ INIT_DELAYED_WORK(&dev->work, acc_work);
/* _acc_dev must be set before calling usb_gadget_register_driver */
_acc_dev = dev;
ret = misc_register(&acc_device);
if (ret)
- goto err1;
-
- ret = usb_add_function(c, &dev->function);
- if (ret)
- goto err2;
+ goto err;
return 0;
-err2:
- misc_deregister(&acc_device);
-err1:
+err:
kfree(dev);
printk(KERN_ERR "USB accessory gadget driver failed to initialize\n");
return ret;
}
-static struct android_usb_function acc_function = {
- .name = "accessory",
- .bind_config = acc_bind_config,
-};
-
-static int __init init(void)
+static void acc_cleanup(void)
{
- printk(KERN_INFO "f_accessory init\n");
- android_register_function(&acc_function);
- return 0;
+ misc_deregister(&acc_device);
+ kfree(_acc_dev);
+ _acc_dev = NULL;
}
-module_init(init);