leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: gadget: epautoconf: rework ep_matches() function

Browse Source 
Rework ep_matches() function to make it shorter and more readable.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Robert Baldyga 2015-08-06 14:11:09 +02:00 committed by Felipe Balbi
parent 5dbe135a15
commit 26bf956aa9
1 changed files with 33 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
drivers/usb/gadget/epautoconf.c
View File

@ -32,7 +32,6 @@ ep_matches (
{ {
u8 type; u8 type;
u16 max; u16 max;
int num_req_streams = 0; int num_req_streams = 0;
/* endpoint already claimed? */ /* endpoint already claimed? */
@ -40,6 +39,20 @@ ep_matches (
return 0; return 0;
type = usb_endpoint_type(desc); type = usb_endpoint_type(desc);
max = 0x7ff & usb_endpoint_maxp(desc);
if (usb_endpoint_dir_in(desc) && !ep->caps.dir_in)
return 0;
if (usb_endpoint_dir_out(desc) && !ep->caps.dir_out)
return 0;
if (max > ep->maxpacket_limit)
return 0;
/* "high bandwidth" works only at high speed */
if (!gadget_is_dualspeed(gadget) && usb_endpoint_maxp(desc) & (3<<11))
return 0;
switch (type) { switch (type) {
case USB_ENDPOINT_XFER_CONTROL: case USB_ENDPOINT_XFER_CONTROL:
/* only support ep0 for portable CONTROL traffic */ /* only support ep0 for portable CONTROL traffic */
@ -47,66 +60,36 @@ ep_matches (
case USB_ENDPOINT_XFER_ISOC: case USB_ENDPOINT_XFER_ISOC:
if (!ep->caps.type_iso) if (!ep->caps.type_iso)
return 0; return 0;
/* ISO: limit 1023 bytes full speed,
* 1024 high/super speed
*/
if (!gadget_is_dualspeed(gadget) && max > 1023)
return 0;
break; break;
case USB_ENDPOINT_XFER_BULK: case USB_ENDPOINT_XFER_BULK:
if (!ep->caps.type_bulk) if (!ep->caps.type_bulk)
return 0; return 0;
break; if (ep_comp && gadget_is_superspeed(gadget)) {
case USB_ENDPOINT_XFER_INT: /* Get the number of required streams from the
/* bulk endpoints handle interrupt transfers, * EP companion descriptor and see if the EP
* except the toggle-quirky iso-synch kind * matches it
*/ */
if (!ep->caps.type_int && !ep->caps.type_bulk)
return 0;
break;
}
if (usb_endpoint_dir_in(desc)) {
if (!ep->caps.dir_in)
return 0;
} else {
if (!ep->caps.dir_out)
return 0;
}
/*
* Get the number of required streams from the EP companion
* descriptor and see if the EP matches it
*/
if (usb_endpoint_xfer_bulk(desc)) {
if (ep_comp && gadget->max_speed >= USB_SPEED_SUPER) {
num_req_streams = ep_comp->bmAttributes & 0x1f; num_req_streams = ep_comp->bmAttributes & 0x1f;
if (num_req_streams > ep->max_streams) if (num_req_streams > ep->max_streams)
return 0; return 0;
} }
break;
}
/* endpoint maxpacket size is an input parameter, except for bulk
* where it's an output parameter representing the full speed limit.
* the usb spec fixes high speed bulk maxpacket at 512 bytes.
*/
max = 0x7ff & usb_endpoint_maxp(desc);
switch (type) {
case USB_ENDPOINT_XFER_INT: case USB_ENDPOINT_XFER_INT:
/* INT: limit 64 bytes full speed, 1024 high/super speed */ /* Bulk endpoints handle interrupt transfers,
* except the toggle-quirky iso-synch kind
*/
if (!ep->caps.type_int && !ep->caps.type_bulk)
return 0;
/* INT: limit 64 bytes full speed,
* 1024 high/super speed
*/
if (!gadget_is_dualspeed(gadget) && max > 64) if (!gadget_is_dualspeed(gadget) && max > 64)
return 0; return 0;
/* FALLTHROUGH */
case USB_ENDPOINT_XFER_ISOC:
/* ISO: limit 1023 bytes full speed, 1024 high/super speed */
if (ep->maxpacket_limit < max)
return 0;
if (!gadget_is_dualspeed(gadget) && max > 1023)
return 0;
/* BOTH: "high bandwidth" works only at high speed */
if ((desc->wMaxPacketSize & cpu_to_le16(3<<11))) {
if (!gadget_is_dualspeed(gadget))
return 0;
/* configure your hardware with enough buffering!! */
}
break; break;
} }