On Wed, 17 Jun 2015 13:43:44 +0800
Li Jun <jun.li@xxxxxxxxxxxxx> wrote:
> Allocate and initialize usb otg descriptor according to gadget otg
> capabilities, add it for each usb configurations, free it while
> composite unbind. If otg capability is not defined, keep its otg
> descriptor unchanged.
>
> Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx>
> ---
> drivers/usb/gadget/legacy/ether.c | 38 ++++++++++++++++++++++++--------------
> 1 file changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/usb/gadget/legacy/ether.c b/drivers/usb/gadget/legacy/ether.c
> index a3323dc..06f4a30 100644
> --- a/drivers/usb/gadget/legacy/ether.c
> +++ b/drivers/usb/gadget/legacy/ether.c
> @@ -171,20 +171,7 @@ static struct usb_device_descriptor device_desc = {
> .bNumConfigurations = 1,
> };
>
> -static struct usb_otg_descriptor otg_descriptor = {
> - .bLength = sizeof otg_descriptor,
> - .bDescriptorType = USB_DT_OTG,
> -
> - /* REVISIT SRP-only hardware is possible, although
> - * it would not be called "OTG" ...
> - */
> - .bmAttributes = USB_OTG_SRP | USB_OTG_HNP,
> -};
> -
> -static const struct usb_descriptor_header *otg_desc[] = {
> - (struct usb_descriptor_header *) &otg_descriptor,
> - NULL,
> -};
> +static const struct usb_descriptor_header *otg_desc[2];
>
> static struct usb_string strings_dev[] = {
> [USB_GADGET_MANUFACTURER_IDX].s = "",
> @@ -229,6 +216,16 @@ static int rndis_do_config(struct usb_configuration *c)
> /* FIXME alloc iConfiguration string, set it in c->strings */
>
> if (gadget_is_otg(c->cdev->gadget)) {
> + if (!otg_desc[0]) {
> + struct usb_descriptor_header *usb_desc;
> +
> + usb_desc = usb_otg_descriptor_alloc(c->cdev->gadget);
> + if (!usb_desc)
> + return -ENOMEM;
> + usb_otg_descriptor_init(c->cdev->gadget, usb_desc);
> + otg_desc[0] = usb_desc;
> + otg_desc[1] = NULL;
> + }
Why can't you do the otg_desc alloc/init in eth_bind()?
That way you don't have to have this code twice
in rndis_do_config() and eth_do_config().
It also matches the free being done in eth_unbind().
> c->descriptors = otg_desc;
> c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
> }
> @@ -271,6 +268,16 @@ static int eth_do_config(struct usb_configuration *c)
> /* FIXME alloc iConfiguration string, set it in c->strings */
>
> if (gadget_is_otg(c->cdev->gadget)) {
> + if (!otg_desc[0]) {
> + struct usb_descriptor_header *usb_desc;
> +
> + usb_desc = usb_otg_descriptor_alloc(c->cdev->gadget);
> + if (!usb_desc)
> + return -ENOMEM;
> + usb_otg_descriptor_init(c->cdev->gadget, usb_desc);
> + otg_desc[0] = usb_desc;
> + otg_desc[1] = NULL;
> + }
> c->descriptors = otg_desc;
> c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
> }
> @@ -463,6 +470,9 @@ static int eth_unbind(struct usb_composite_dev *cdev)
> usb_put_function(f_geth);
> usb_put_function_instance(fi_geth);
> }
> + kfree(otg_desc[0]);
> + otg_desc[0] = NULL;
> +
> return 0;
> }
>
cheers,
-roger
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
