shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: usb:gadget:Add "state" attribute to android_device

Browse Source 
Added a device attribute to android_device to
determine USB_GADGET's state

Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: I17f8903120df96bf2f4bf441940b53a87b818230
This commit is contained in:
Badhri Jagan Sridharan
2015-07-14 15:46:11 -07:00
committed by Dmitry Shmidt
parent 9061f251d4
commit 9150ea1e9f
1 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/usb/gadget/configfs.c
View File

@@ -1554,11 +1554,49 @@ static const struct usb_gadget_driver configfs_driver_template = {
.match_existing_only = 1,
};
#ifdef CONFIG_USB_CONFIGFS_UEVENT
static ssize_t state_show(struct device *pdev, struct device_attribute *attr,
char *buf)
{
struct gadget_info *dev = dev_get_drvdata(pdev);
struct usb_composite_dev *cdev;
char *state = "DISCONNECTED";
unsigned long flags;
if (!dev)
goto out;
cdev = &dev->cdev;
if (!cdev)
goto out;
spin_lock_irqsave(&cdev->lock, flags);
if (cdev->config)
state = "CONFIGURED";
else if (dev->connected)
state = "CONNECTED";
spin_unlock_irqrestore(&cdev->lock, flags);
out:
return sprintf(buf, "%s\n", state);
}
static DEVICE_ATTR(state, S_IRUGO, state_show, NULL);
static struct device_attribute *android_usb_attributes[] = {
&dev_attr_state,
NULL
};
#endif
static struct config_group *gadgets_make(
struct config_group *group,
const char *name)
{
struct gadget_info *gi;
struct device_attribute **attrs;
struct device_attribute *attr;
int err;
gi = kzalloc(sizeof(*gi), GFP_KERNEL);
if (!gi)
@@ -1608,12 +1646,31 @@ static struct config_group *gadgets_make(
MKDEV(0, 0), NULL, "android0");
if (IS_ERR(android_device))
goto err;
dev_set_drvdata(android_device, gi);
attrs = android_usb_attributes;
while ((attr = *attrs++)) {
err = device_create_file(android_device, attr);
if (err)
goto err1;
}
#endif
if (!gi->composite.gadget_driver.function)
goto err;
goto err1;
return &gi->group;
err1:
#ifdef CONFIG_USB_CONFIGFS_UEVENT
attrs = android_usb_attributes;
while ((attr = *attrs++))
device_remove_file(android_device, attr);
device_destroy(android_device->class,
android_device->devt);
#endif
err:
kfree(gi);
return ERR_PTR(-ENOMEM);
@@ -1621,8 +1678,15 @@ err:
static void gadgets_drop(struct config_group *group, struct config_item *item)
{
struct device_attribute **attrs;
struct device_attribute *attr;
config_item_put(item);
#ifdef CONFIG_USB_CONFIGFS_UEVENT
attrs = android_usb_attributes;
while ((attr = *attrs++))
device_remove_file(android_device, attr);
device_destroy(android_device->class, android_device->devt);
#endif
}