redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: emxx_udc: add ep capabilities support

Browse source 
Convert endpoint configuration to new capabilities model.

Fixed typo in "epc-nulk" to "epc-bulk".

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-07-31 16:00:16 +02:00 committed by Felipe Balbi
parent 80e6e3847f
commit 68b5c94751
1 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/staging/emxx_udc/emxx_udc.c
View file

@ -3153,36 +3153,46 @@ static const struct usb_gadget_ops nbu2ss_gadget_ops = {
.ioctl = nbu2ss_gad_ioctl, .ioctl = nbu2ss_gad_ioctl,
}; };
static const char g_ep0_name[] = "ep0"; static const struct {
static const char g_ep1_name[] = "ep1-bulk"; const char *name;
static const char g_ep2_name[] = "ep2-bulk"; const struct usb_ep_caps caps;
static const char g_ep3_name[] = "ep3in-int"; } ep_info[NUM_ENDPOINTS] = {
static const char g_ep4_name[] = "ep4-iso"; #define EP_INFO(_name, _caps) \
static const char g_ep5_name[] = "ep5-iso"; { \
static const char g_ep6_name[] = "ep6-bulk"; .name = _name, \
static const char g_ep7_name[] = "ep7-bulk"; .caps = _caps, \
static const char g_ep8_name[] = "ep8in-int"; }
static const char g_ep9_name[] = "ep9-iso";
static const char g_epa_name[] = "epa-iso";
static const char g_epb_name[] = "epb-bulk";
static const char g_epc_name[] = "epc-nulk";
static const char g_epd_name[] = "epdin-int";
static const char *gp_ep_name[NUM_ENDPOINTS] = { EP_INFO("ep0",
g_ep0_name, USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL, USB_EP_CAPS_DIR_ALL)),
g_ep1_name, EP_INFO("ep1-bulk",
g_ep2_name, USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_ALL)),
g_ep3_name, EP_INFO("ep2-bulk",
g_ep4_name, USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_ALL)),
g_ep5_name, EP_INFO("ep3in-int",
g_ep6_name, USB_EP_CAPS(USB_EP_CAPS_TYPE_INT, USB_EP_CAPS_DIR_IN)),
g_ep7_name, EP_INFO("ep4-iso",
g_ep8_name, USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_ALL)),
g_ep9_name, EP_INFO("ep5-iso",
g_epa_name, USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_ALL)),
g_epb_name, EP_INFO("ep6-bulk",
g_epc_name, USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_ALL)),
g_epd_name, EP_INFO("ep7-bulk",
USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_ALL)),
EP_INFO("ep8in-int",
USB_EP_CAPS(USB_EP_CAPS_TYPE_INT, USB_EP_CAPS_DIR_IN)),
EP_INFO("ep9-iso",
USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_ALL)),
EP_INFO("epa-iso",
USB_EP_CAPS(USB_EP_CAPS_TYPE_ISO, USB_EP_CAPS_DIR_ALL)),
EP_INFO("epb-bulk",
USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_ALL)),
EP_INFO("epc-bulk",
USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_ALL)),
EP_INFO("epdin-int",
USB_EP_CAPS(USB_EP_CAPS_TYPE_INT, USB_EP_CAPS_DIR_IN)),
#undef EP_INFO
}; };
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
@ -3200,7 +3210,8 @@ static void __init nbu2ss_drv_ep_init(struct nbu2ss_udc *udc)
ep->desc = NULL; ep->desc = NULL;
ep->ep.driver_data = NULL; ep->ep.driver_data = NULL;
ep->ep.name = gp_ep_name[i]; ep->ep.name = ep_info[i].name;
ep->ep.caps = ep_info[i].caps;
ep->ep.ops = &nbu2ss_ep_ops; ep->ep.ops = &nbu2ss_ep_ops;
usb_ep_set_maxpacket_limit(&ep->ep, usb_ep_set_maxpacket_limit(&ep->ep,