[PATCH v2 09/22] usb: gadget: add usb_otg_descriptor_add interface to init usb_otg_descriptor

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Allocate usb_otg_descriptor and initialize it according to gadget otg
options, if none of options is not set, keep bmAttributes setting as
current gadget drivers, with this new interface, usb_otg_descriptor can
include bcdOTG if OTG 2.0 or later, and otg features can be decided by
the combination of usb hardware property and driver config.

Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx>
---
 drivers/usb/gadget/config.c | 37 +++++++++++++++++++++++++++++++++++++
 include/linux/usb/gadget.h  |  1 +
 2 files changed, 38 insertions(+)

diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index 34e12fc..a86e079 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -195,3 +195,40 @@ void usb_free_all_descriptors(struct usb_function *f)
 	usb_free_descriptors(f->ss_descriptors);
 }
 EXPORT_SYMBOL_GPL(usb_free_all_descriptors);
+
+struct usb_otg_descriptor *usb_otg_descriptor_add(struct usb_gadget *gadget)
+{
+	struct usb_otg_descriptor *otg_desc;
+	unsigned otg_desc_length;
+
+	if (gadget->otg_rev >= 0x0200)
+		otg_desc_length = sizeof(*otg_desc) + sizeof(struct bcdOTG);
+	else
+		otg_desc_length = sizeof(*otg_desc);
+
+	otg_desc = (struct usb_otg_descriptor *)kzalloc(otg_desc_length,
+								GFP_KERNEL);
+	if (!otg_desc)
+		return otg_desc;
+
+	otg_desc->bLength = otg_desc_length;
+	otg_desc->bDescriptorType = USB_DT_OTG;
+
+	if (gadget->adp_support || gadget->hnp_support ||
+					gadget->srp_support) {
+		if (gadget->adp_support)
+			otg_desc->bmAttributes |= USB_OTG_ADP;
+		if (gadget->hnp_support)
+			otg_desc->bmAttributes |= USB_OTG_HNP;
+		if (gadget->srp_support)
+			otg_desc->bmAttributes |= USB_OTG_SRP;
+	} else {
+		otg_desc->bmAttributes = USB_OTG_SRP | USB_OTG_HNP;
+	}
+
+	if (gadget->otg_rev >= 0x0200)
+		otg_desc->otg_rev[0].bcdOTG = cpu_to_le16(gadget->otg_rev);
+
+	return otg_desc;
+}
+EXPORT_SYMBOL_GPL(usb_otg_descriptor_add);
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 2f4f39c..e210466 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -1013,6 +1013,7 @@ int usb_assign_descriptors(struct usb_function *f,
 		struct usb_descriptor_header **ss);
 void usb_free_all_descriptors(struct usb_function *f);
 
+struct usb_otg_descriptor *usb_otg_descriptor_add(struct usb_gadget *gadget);
 /*-------------------------------------------------------------------------*/
 
 /* utility to simplify map/unmap of usb_requests to/from DMA */
-- 
1.9.1

--
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




[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux