Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33b264a8 authored by Pavankumar Kondeti's avatar Pavankumar Kondeti Committed by Mayank Rana
Browse files

USB: f_accessory: Add super speed descriptors with accessory function 



Update accessory function driver to operate in super speed. The burst
capability is not enabled for now.

Change-Id: Ie95cbfc9444c56c8268b70e2916713190699c71a
Signed-off-by: default avatarPavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: default avatarHemant Kumar <hemantk@codeaurora.org>
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent 1597fd67

drivers/usb/gadget/function/f_accessory.c

+55 −2
Original line number Diff line number Diff line
@@ -136,12 +136,47 @@ static struct usb_interface_descriptor acc_interface_desc = { 
	.bInterfaceProtocol     = 0,

};



static struct usb_endpoint_descriptor acc_superspeed_in_desc = {

	.bLength                = USB_DT_ENDPOINT_SIZE,

	.bDescriptorType        = USB_DT_ENDPOINT,

	.bEndpointAddress       = USB_DIR_IN,

	.bmAttributes           = USB_ENDPOINT_XFER_BULK,

	.wMaxPacketSize         = cpu_to_le16(1024),

};



static struct usb_ss_ep_comp_descriptor acc_superspeed_in_comp_desc = {

	.bLength =		sizeof(acc_superspeed_in_comp_desc),

	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,



	/* the following 2 values can be tweaked if necessary */

	/* .bMaxBurst =		0, */

	/* .bmAttributes =	0, */

};



static struct usb_endpoint_descriptor acc_superspeed_out_desc = {

	.bLength                = USB_DT_ENDPOINT_SIZE,

	.bDescriptorType        = USB_DT_ENDPOINT,

	.bEndpointAddress       = USB_DIR_OUT,

	.bmAttributes           = USB_ENDPOINT_XFER_BULK,

	.wMaxPacketSize         = cpu_to_le16(1024),

};



static struct usb_ss_ep_comp_descriptor acc_superspeed_out_comp_desc = {

	.bLength =		sizeof(acc_superspeed_out_comp_desc),

	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,



	/* the following 2 values can be tweaked if necessary */

	/* .bMaxBurst =		0, */

	/* .bmAttributes =	0, */

};





static struct usb_endpoint_descriptor acc_highspeed_in_desc = {

	.bLength                = USB_DT_ENDPOINT_SIZE,

	.bDescriptorType        = USB_DT_ENDPOINT,

	.bEndpointAddress       = USB_DIR_IN,

	.bmAttributes           = USB_ENDPOINT_XFER_BULK,

	.wMaxPacketSize         = __constant_cpu_to_le16(512),

	.wMaxPacketSize         = cpu_to_le16(512),

};



static struct usb_endpoint_descriptor acc_highspeed_out_desc = {
@@ -149,7 +184,7 @@ static struct usb_endpoint_descriptor acc_highspeed_out_desc = { 
	.bDescriptorType        = USB_DT_ENDPOINT,

	.bEndpointAddress       = USB_DIR_OUT,

	.bmAttributes           = USB_ENDPOINT_XFER_BULK,

	.wMaxPacketSize         = __constant_cpu_to_le16(512),

	.wMaxPacketSize         = cpu_to_le16(512),

};



static struct usb_endpoint_descriptor acc_fullspeed_in_desc = {
@@ -180,6 +215,15 @@ static struct usb_descriptor_header *hs_acc_descs[] = { 
	NULL,

};



static struct usb_descriptor_header *ss_acc_descs[] = {

	(struct usb_descriptor_header *) &acc_interface_desc,

	(struct usb_descriptor_header *) &acc_superspeed_in_desc,

	(struct usb_descriptor_header *) &acc_superspeed_in_comp_desc,

	(struct usb_descriptor_header *) &acc_superspeed_out_desc,

	(struct usb_descriptor_header *) &acc_superspeed_out_comp_desc,

	NULL,

};



static struct usb_string acc_string_defs[] = {

	[INTERFACE_STRING_INDEX].s	= "Android Accessory Interface",

	{  },	/* end of list */
@@ -957,6 +1001,14 @@ __acc_function_bind(struct usb_configuration *c, 
			acc_fullspeed_out_desc.bEndpointAddress;

	}



	/* support super speed hardware */

	if (gadget_is_superspeed(c->cdev->gadget)) {

		acc_superspeed_in_desc.bEndpointAddress =

			acc_fullspeed_in_desc.bEndpointAddress;

		acc_superspeed_out_desc.bEndpointAddress =

			acc_fullspeed_out_desc.bEndpointAddress;

	}



	DBG(cdev, "%s speed %s: IN/%s, OUT/%s\n",

			gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",

			f->name, dev->ep_in->name, dev->ep_out->name);
@@ -1313,6 +1365,7 @@ static struct usb_function *acc_alloc(struct usb_function_instance *fi) 
	dev->function.strings = acc_strings,

	dev->function.fs_descriptors = fs_acc_descs;

	dev->function.hs_descriptors = hs_acc_descs;

	dev->function.ss_descriptors = ss_acc_descs;

	dev->function.bind = acc_function_bind_configfs;

	dev->function.unbind = acc_function_unbind;

	dev->function.set_alt = acc_function_set_alt;