From: Robert Baldyga <r.baldyga@samsung.com> To: gregkh@linuxfoundation.org Cc: Peter.Chen@freescale.com, johnyoun@synopsys.com, balbi@ti.com, dahlmann.thomas@arcor.de, nicolas.ferre@atmel.com, cernekee@gmail.com, leoli@freescale.com, daniel@zonque.org, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, michal.simek@xilinx.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-geode@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, andrzej.p@samsung.com, m.szyprowski@samsung.com, Robert Baldyga <r.baldyga@samsung.com> Subject: [PATCH 04/37] staging: emxx_udc: add ep capabilities support Date: Wed, 08 Jul 2015 13:08:48 +0200 [thread overview] Message-ID: <1436353761-7107-5-git-send-email-r.baldyga@samsung.com> (raw) In-Reply-To: <1436353761-7107-1-git-send-email-r.baldyga@samsung.com> Convert endpoint configuration to new capabilities model. Fixed typo in "epc-nulk" to "epc-bulk". Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> --- drivers/staging/emxx_udc/emxx_udc.c | 60 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index 3b7aa36..0d64bee 100644 --- a/drivers/staging/emxx_udc/emxx_udc.c +++ b/drivers/staging/emxx_udc/emxx_udc.c @@ -3153,36 +3153,33 @@ static const struct usb_gadget_ops nbu2ss_gadget_ops = { .ioctl = nbu2ss_gad_ioctl, }; -static const char g_ep0_name[] = "ep0"; -static const char g_ep1_name[] = "ep1-bulk"; -static const char g_ep2_name[] = "ep2-bulk"; -static const char g_ep3_name[] = "ep3in-int"; -static const char g_ep4_name[] = "ep4-iso"; -static const char g_ep5_name[] = "ep5-iso"; -static const char g_ep6_name[] = "ep6-bulk"; -static const char g_ep7_name[] = "ep7-bulk"; -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] = { - g_ep0_name, - g_ep1_name, - g_ep2_name, - g_ep3_name, - g_ep4_name, - g_ep5_name, - g_ep6_name, - g_ep7_name, - g_ep8_name, - g_ep9_name, - g_epa_name, - g_epb_name, - g_epc_name, - g_epd_name, +static const struct { + const char *name; + const struct usb_ep_caps caps; +} ep_info[NUM_ENDPOINTS] = { +#define EP_INFO(_name, _type, _dir) \ + { \ + .name = _name, \ + .caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## _type, \ + USB_EP_CAPS_DIR_ ## _dir), \ + } + + EP_INFO("ep0", CONTROL, ALL), + EP_INFO("ep1-bulk", BULK, ALL), + EP_INFO("ep2-bulk", BULK, ALL), + EP_INFO("ep3in-int", INT, IN), + EP_INFO("ep4-iso", INT, ALL), + EP_INFO("ep5-iso", ISO, ALL), + EP_INFO("ep6-bulk", ISO, ALL), + EP_INFO("ep7-bulk", BULK, ALL), + EP_INFO("ep8in-int", INT, IN), + EP_INFO("ep9-iso", ISO, ALL), + EP_INFO("epa-iso", ISO, ALL), + EP_INFO("epb-bulk", BULK, ALL), + EP_INFO("epc-bulk", BULK, ALL), + EP_INFO("epdin-int", INT, IN), + +#undef EP_INFO }; /*-------------------------------------------------------------------------*/ @@ -3200,7 +3197,8 @@ static void __init nbu2ss_drv_ep_init(struct nbu2ss_udc *udc) ep->desc = 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; usb_ep_set_maxpacket_limit(&ep->ep, -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: r.baldyga@samsung.com (Robert Baldyga) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/37] staging: emxx_udc: add ep capabilities support Date: Wed, 08 Jul 2015 13:08:48 +0200 [thread overview] Message-ID: <1436353761-7107-5-git-send-email-r.baldyga@samsung.com> (raw) In-Reply-To: <1436353761-7107-1-git-send-email-r.baldyga@samsung.com> Convert endpoint configuration to new capabilities model. Fixed typo in "epc-nulk" to "epc-bulk". Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> --- drivers/staging/emxx_udc/emxx_udc.c | 60 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index 3b7aa36..0d64bee 100644 --- a/drivers/staging/emxx_udc/emxx_udc.c +++ b/drivers/staging/emxx_udc/emxx_udc.c @@ -3153,36 +3153,33 @@ static const struct usb_gadget_ops nbu2ss_gadget_ops = { .ioctl = nbu2ss_gad_ioctl, }; -static const char g_ep0_name[] = "ep0"; -static const char g_ep1_name[] = "ep1-bulk"; -static const char g_ep2_name[] = "ep2-bulk"; -static const char g_ep3_name[] = "ep3in-int"; -static const char g_ep4_name[] = "ep4-iso"; -static const char g_ep5_name[] = "ep5-iso"; -static const char g_ep6_name[] = "ep6-bulk"; -static const char g_ep7_name[] = "ep7-bulk"; -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] = { - g_ep0_name, - g_ep1_name, - g_ep2_name, - g_ep3_name, - g_ep4_name, - g_ep5_name, - g_ep6_name, - g_ep7_name, - g_ep8_name, - g_ep9_name, - g_epa_name, - g_epb_name, - g_epc_name, - g_epd_name, +static const struct { + const char *name; + const struct usb_ep_caps caps; +} ep_info[NUM_ENDPOINTS] = { +#define EP_INFO(_name, _type, _dir) \ + { \ + .name = _name, \ + .caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## _type, \ + USB_EP_CAPS_DIR_ ## _dir), \ + } + + EP_INFO("ep0", CONTROL, ALL), + EP_INFO("ep1-bulk", BULK, ALL), + EP_INFO("ep2-bulk", BULK, ALL), + EP_INFO("ep3in-int", INT, IN), + EP_INFO("ep4-iso", INT, ALL), + EP_INFO("ep5-iso", ISO, ALL), + EP_INFO("ep6-bulk", ISO, ALL), + EP_INFO("ep7-bulk", BULK, ALL), + EP_INFO("ep8in-int", INT, IN), + EP_INFO("ep9-iso", ISO, ALL), + EP_INFO("epa-iso", ISO, ALL), + EP_INFO("epb-bulk", BULK, ALL), + EP_INFO("epc-bulk", BULK, ALL), + EP_INFO("epdin-int", INT, IN), + +#undef EP_INFO }; /*-------------------------------------------------------------------------*/ @@ -3200,7 +3197,8 @@ static void __init nbu2ss_drv_ep_init(struct nbu2ss_udc *udc) ep->desc = 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; usb_ep_set_maxpacket_limit(&ep->ep, -- 1.9.1
next prev parent reply other threads:[~2015-07-08 11:10 UTC|newest] Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-08 11:08 [PATCH 00/37] usb: gadget: rework ep matching and claiming mechanism Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 01/37] usb: gadget: encapsulate endpoint " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 02/37] usb: gadget: add endpoint capabilities flags Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 03/37] usb: gadget: add endpoint capabilities helper macros Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga [this message] 2015-07-08 11:08 ` [PATCH 04/37] staging: emxx_udc: add ep capabilities support Robert Baldyga 2015-07-08 11:08 ` [PATCH 05/37] usb: chipidea: udc: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 06/37] usb: dwc2: gadget: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 07/37] usb: dwc3: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 08/37] usb: gadget: amd5536udc: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 09/37] usb: gadget: at91_udc: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 10/37] usb: gadget: bcm63xx_udc: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 11/37] usb: gadget: bdc: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 12/37] usb: gadget: dummy-hcd: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 13/37] usb: gadget: fotg210-udc: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 14/37] usb: gadget: fsl_qe_udc: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` [PATCH 15/37] usb: gadget: fsl_udc_core: " Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:08 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 16/37] usb: gadget: fusb300_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 17/37] usb: gadget: goku_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 18/37] usb: gadget: gr_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 19/37] usb: gadget: lpc32xx_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 20/37] usb: gadget: m66592-udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 21/37] usb: gadget: mv_u3d_core: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 22/37] usb: gadget: mv_udc_core: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 23/37] usb: gadget: net2272: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 24/37] usb: gadget: net2280: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 25/37] usb: gadget: omap_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 26/37] usb: gadget: pch_ud: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 27/37] usb: gadget: pxa25x_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 28/37] usb: gadget: pxa27x_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 19:26 ` Robert Jarzmik 2015-07-08 19:26 ` Robert Jarzmik 2015-07-08 19:26 ` Robert Jarzmik 2015-07-08 11:09 ` [PATCH 29/37] usb: gadget: r8a66597-udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 30/37] usb: gadget: s3c-hsudc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 31/37] usb: gadget: s3c2410_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 32/37] usb: gadget: udc-xilinx: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 33/37] usb: isp1760: udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 34/37] usb: musb: gadget: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 35/37] usb: renesas: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 36/37] usb: gadget: atmel_usba_udc: " Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` [PATCH 37/37] usb: gadget: epautoconf: add endpoint capabilities flags verification Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga 2015-07-08 11:09 ` Robert Baldyga
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1436353761-7107-5-git-send-email-r.baldyga@samsung.com \ --to=r.baldyga@samsung.com \ --cc=Peter.Chen@freescale.com \ --cc=andrzej.p@samsung.com \ --cc=balbi@ti.com \ --cc=cernekee@gmail.com \ --cc=dahlmann.thomas@arcor.de \ --cc=daniel@zonque.org \ --cc=devel@driverdev.osuosl.org \ --cc=gregkh@linuxfoundation.org \ --cc=haojian.zhuang@gmail.com \ --cc=johnyoun@synopsys.com \ --cc=leoli@freescale.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-geode@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=m.szyprowski@samsung.com \ --cc=michal.simek@xilinx.com \ --cc=nicolas.ferre@atmel.com \ --cc=robert.jarzmik@free.fr \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.