DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: gadget: android: Support switching vendor ID when configuration changes

Browse Source 
Based on the list of enabled USB functions, we can now switch the vendor ID
as well as the product ID.

Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2011-02-09 09:38:26 -05:00
committed by Colin Cross
parent 6bb1acf2eb
commit aecca43f09
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/usb/gadget/android.c
View File

@@ -65,6 +65,7 @@ struct android_dev {
int num_functions; int num_functions;
char **functions; char **functions;
int vendor_id;
int product_id; int product_id;
int version; int version;
}; };
@@ -254,6 +255,22 @@ static int product_matches_functions(struct android_usb_product *p)
return 1; return 1;
} }
static int get_vendor_id(struct android_dev *dev)
{
struct android_usb_product *p = dev->products;
int count = dev->num_products;
int i;
if (p) {
for (i = 0; i < count; i++, p++) {
if (p->vendor_id && product_matches_functions(p))
return p->vendor_id;
}
}
/* use default vendor ID */
return dev->vendor_id;
}
static int get_product_id(struct android_dev *dev) static int get_product_id(struct android_dev *dev)
{ {
struct android_usb_product *p = dev->products; struct android_usb_product *p = dev->products;
@@ -274,7 +291,7 @@ static int android_bind(struct usb_composite_dev *cdev)
{ {
struct android_dev *dev = _android_dev; struct android_dev *dev = _android_dev;
struct usb_gadget *gadget = cdev->gadget; struct usb_gadget *gadget = cdev->gadget;
int gcnum, id, product_id, ret; int gcnum, id, ret;
printk(KERN_INFO "android_bind\n"); printk(KERN_INFO "android_bind\n");
@@ -324,8 +341,8 @@ static int android_bind(struct usb_composite_dev *cdev)
usb_gadget_set_selfpowered(gadget); usb_gadget_set_selfpowered(gadget);
dev->cdev = cdev; dev->cdev = cdev;
product_id = get_product_id(dev); device_desc.idVendor = __constant_cpu_to_le16(get_vendor_id(dev));
device_desc.idProduct = __constant_cpu_to_le16(product_id); device_desc.idProduct = __constant_cpu_to_le16(get_product_id(dev));
cdev->desc.idProduct = device_desc.idProduct; cdev->desc.idProduct = device_desc.idProduct;
return 0; return 0;
@@ -394,7 +411,6 @@ void android_enable_function(struct usb_function *f, int enable)
{ {
struct android_dev *dev = _android_dev; struct android_dev *dev = _android_dev;
int disable = !enable; int disable = !enable;
int product_id;
if (!!f->disabled != disable) { if (!!f->disabled != disable) {
usb_function_set_enabled(f, !disable); usb_function_set_enabled(f, !disable);
@@ -416,8 +432,8 @@ void android_enable_function(struct usb_function *f, int enable)
update_dev_desc(dev); update_dev_desc(dev);
product_id = get_product_id(dev); device_desc.idVendor = __constant_cpu_to_le16(get_vendor_id(dev));
device_desc.idProduct = __constant_cpu_to_le16(product_id); device_desc.idProduct = __constant_cpu_to_le16(get_product_id(dev));
if (dev->cdev) if (dev->cdev)
dev->cdev->desc.idProduct = device_desc.idProduct; dev->cdev->desc.idProduct = device_desc.idProduct;
usb_composite_force_reset(dev->cdev); usb_composite_force_reset(dev->cdev);
@@ -436,9 +452,11 @@ static int android_probe(struct platform_device *pdev)
dev->num_products = pdata->num_products; dev->num_products = pdata->num_products;
dev->functions = pdata->functions; dev->functions = pdata->functions;
dev->num_functions = pdata->num_functions; dev->num_functions = pdata->num_functions;
if (pdata->vendor_id) if (pdata->vendor_id) {
dev->vendor_id = pdata->vendor_id;
device_desc.idVendor = device_desc.idVendor =
__constant_cpu_to_le16(pdata->vendor_id); __constant_cpu_to_le16(pdata->vendor_id);
}
if (pdata->product_id) { if (pdata->product_id) {
dev->product_id = pdata->product_id; dev->product_id = pdata->product_id;
device_desc.idProduct = device_desc.idProduct =

7
include/linux/usb/android_composite.h
View File

@@ -27,7 +27,12 @@ struct android_usb_function {
}; };
struct android_usb_product { struct android_usb_product {
/* Default product ID. */ /* Vendor ID for this set of functions.
* Default vendor_id in platform data will be used if this is zero.
*/
__u16 vendor_id;
/* Product ID for this set of functions. */
__u16 product_id; __u16 product_id;
/* List of function names associated with this product. /* List of function names associated with this product.