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

Commit dbf499cf authored by Janusz Dziedzic's avatar Janusz Dziedzic Committed by Felipe Balbi
Browse files

usb: gadget: f_hid add super speed support 



Add super speed descriptors to f_hid.

Signed-off-by: default avatarJanusz Dziedzic <januszx.dziedzic@linux.intel.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent dc9ef588

drivers/usb/gadget/function/f_hid.c

+66 −1
Original line number Diff line number Diff line
@@ -98,6 +98,60 @@ static struct hid_descriptor hidg_desc = { 
	/*.desc[0].wDescriptorLenght	= DYNAMIC */

};



/* Super-Speed Support */



static struct usb_endpoint_descriptor hidg_ss_in_ep_desc = {

	.bLength		= USB_DT_ENDPOINT_SIZE,

	.bDescriptorType	= USB_DT_ENDPOINT,

	.bEndpointAddress	= USB_DIR_IN,

	.bmAttributes		= USB_ENDPOINT_XFER_INT,

	/*.wMaxPacketSize	= DYNAMIC */

	.bInterval		= 4, /* FIXME: Add this field in the

				      * HID gadget configuration?

				      * (struct hidg_func_descriptor)

				      */

};



static struct usb_ss_ep_comp_descriptor hidg_ss_in_comp_desc = {

	.bLength                = sizeof(hidg_ss_in_comp_desc),

	.bDescriptorType        = USB_DT_SS_ENDPOINT_COMP,



	/* .bMaxBurst           = 0, */

	/* .bmAttributes        = 0, */

	/* .wBytesPerInterval   = DYNAMIC */

};



static struct usb_endpoint_descriptor hidg_ss_out_ep_desc = {

	.bLength		= USB_DT_ENDPOINT_SIZE,

	.bDescriptorType	= USB_DT_ENDPOINT,

	.bEndpointAddress	= USB_DIR_OUT,

	.bmAttributes		= USB_ENDPOINT_XFER_INT,

	/*.wMaxPacketSize	= DYNAMIC */

	.bInterval		= 4, /* FIXME: Add this field in the

				      * HID gadget configuration?

				      * (struct hidg_func_descriptor)

				      */

};



static struct usb_ss_ep_comp_descriptor hidg_ss_out_comp_desc = {

	.bLength                = sizeof(hidg_ss_out_comp_desc),

	.bDescriptorType        = USB_DT_SS_ENDPOINT_COMP,



	/* .bMaxBurst           = 0, */

	/* .bmAttributes        = 0, */

	/* .wBytesPerInterval   = DYNAMIC */

};



static struct usb_descriptor_header *hidg_ss_descriptors[] = {

	(struct usb_descriptor_header *)&hidg_interface_desc,

	(struct usb_descriptor_header *)&hidg_desc,

	(struct usb_descriptor_header *)&hidg_ss_in_ep_desc,

	(struct usb_descriptor_header *)&hidg_ss_in_comp_desc,

	(struct usb_descriptor_header *)&hidg_ss_out_ep_desc,

	(struct usb_descriptor_header *)&hidg_ss_out_comp_desc,

	NULL,

};



/* High-Speed Support */



static struct usb_endpoint_descriptor hidg_hs_in_ep_desc = {
@@ -624,8 +678,14 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) 
	/* set descriptor dynamic values */

	hidg_interface_desc.bInterfaceSubClass = hidg->bInterfaceSubClass;

	hidg_interface_desc.bInterfaceProtocol = hidg->bInterfaceProtocol;

	hidg_ss_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	hidg_ss_in_comp_desc.wBytesPerInterval =

				cpu_to_le16(hidg->report_length);

	hidg_hs_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	hidg_fs_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	hidg_ss_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	hidg_ss_out_comp_desc.wBytesPerInterval =

				cpu_to_le16(hidg->report_length);

	hidg_hs_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	hidg_fs_out_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length);

	/*
@@ -641,8 +701,13 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) 
	hidg_hs_out_ep_desc.bEndpointAddress =

		hidg_fs_out_ep_desc.bEndpointAddress;



	hidg_ss_in_ep_desc.bEndpointAddress =

		hidg_fs_in_ep_desc.bEndpointAddress;

	hidg_ss_out_ep_desc.bEndpointAddress =

		hidg_fs_out_ep_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, hidg_fs_descriptors,

			hidg_hs_descriptors, NULL, NULL);

			hidg_hs_descriptors, hidg_ss_descriptors, NULL);

	if (status)

		goto fail;