From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758862AbbGHLNy (ORCPT ); Wed, 8 Jul 2015 07:13:54 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:35096 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758257AbbGHLNu (ORCPT ); Wed, 8 Jul 2015 07:13:50 -0400 X-AuditID: cbfee61b-f79416d0000014c0-12-559d05ec00da From: Robert Baldyga 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 Subject: [PATCH 28/37] usb: gadget: pxa27x_udc: add ep capabilities support Date: Wed, 08 Jul 2015 13:09:12 +0200 Message-id: <1436353761-7107-29-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1436353761-7107-1-git-send-email-r.baldyga@samsung.com> References: <1436353761-7107-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e+xoO4b1rmhBit69C1mvWxnsTh4v95i 74K7jBad9w8zWzT9fcVisefML3aL5sXr2SwurDO32H36EqPFrwdCFpseX2O16D93msXi8q45 bBazl/SzWCxa1sps8fv7P1aLtUfuslu8exlh8e1yM7vFsdl/mSweHN7JbjHrjbCDmMfkJxuZ PBb82sricW/fYRaP/nWfWT3+He5n8tg56y67x/65a9g9Ni+p9zg/YyGjR9+WVYweW/Z/ZvQ4 fmM7k8fnTXIeez//ZvHYvns5SwB/FJdNSmpOZllqkb5dAlfGucadbAVTRSvudXxjamB8KtjF yMkhIWAicf3bWUYIW0ziwr31bF2MXBxCAtMZJe7t+M8I4fxklPi0fBM7SBWbgI7Elu8TwDpE BOQkntz+wwxSxCywm0XiVNdJsCJhAW+J8w+nMoHYLAKqEtcubQKzeQVcJS5P/8ECsU5O4uSx yawgNidQ/Pqxx8wgtpCAi8SH6xuYJzDyLmBkWMUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kR HEfPpHcwrmqwOMQowMGoxMP7IXJOqBBrYllxZe4hRgkOZiUR3nksc0OFeFMSK6tSi/Lji0pz UosPMUpzsCiJ857M9wkVEkhPLEnNTk0tSC2CyTJxcEo1MEZvkJ99wFndOmZT0bZtsTWvRWef XvhzX/N7Ca1/xx/furlMcynnVr+w71FrMrjZnx1k2/Vu35P9G/5Ed1Q+uMWv+aD2TOzNA+K3 X6t8EfXrbltdsrPfTOpyCqt164QTq//0WRzxyeUJfv3uZqRx0GZh14cfT8h15ezyzt5uIdbl GXyNccsy10dKLMUZiYZazEXFiQADWVBMnwIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert endpoint configuration to new capabilities model. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/udc/pxa27x_udc.h | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/usb/gadget/udc/pxa27x_udc.h b/drivers/usb/gadget/udc/pxa27x_udc.h index 11e1423..ded058c 100644 --- a/drivers/usb/gadget/udc/pxa27x_udc.h +++ b/drivers/usb/gadget/udc/pxa27x_udc.h @@ -234,25 +234,28 @@ /* * Endpoint definition helpers */ -#define USB_EP_DEF(addr, bname, dir, type, maxpkt) \ -{ .usb_ep = { .name = bname, .ops = &pxa_ep_ops, .maxpacket = maxpkt, }, \ +#define USB_EP_DEF(addr, bname, dir, type, maxpkt, ctype, cdir) \ +{ .usb_ep = { .name = bname, .ops = &pxa_ep_ops, .maxpacket = maxpkt, \ + .caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## ctype, \ + USB_EP_CAPS_DIR_ ## cdir), }, \ .desc = { .bEndpointAddress = addr | (dir ? USB_DIR_IN : 0), \ - .bmAttributes = type, \ + .bmAttributes = USB_ENDPOINT_XFER_ ## type, \ .wMaxPacketSize = maxpkt, }, \ .dev = &memory \ } -#define USB_EP_BULK(addr, bname, dir) \ - USB_EP_DEF(addr, bname, dir, USB_ENDPOINT_XFER_BULK, BULK_FIFO_SIZE) -#define USB_EP_ISO(addr, bname, dir) \ - USB_EP_DEF(addr, bname, dir, USB_ENDPOINT_XFER_ISOC, ISO_FIFO_SIZE) -#define USB_EP_INT(addr, bname, dir) \ - USB_EP_DEF(addr, bname, dir, USB_ENDPOINT_XFER_INT, INT_FIFO_SIZE) -#define USB_EP_IN_BULK(n) USB_EP_BULK(n, "ep" #n "in-bulk", 1) -#define USB_EP_OUT_BULK(n) USB_EP_BULK(n, "ep" #n "out-bulk", 0) -#define USB_EP_IN_ISO(n) USB_EP_ISO(n, "ep" #n "in-iso", 1) -#define USB_EP_OUT_ISO(n) USB_EP_ISO(n, "ep" #n "out-iso", 0) -#define USB_EP_IN_INT(n) USB_EP_INT(n, "ep" #n "in-int", 1) -#define USB_EP_CTRL USB_EP_DEF(0, "ep0", 0, 0, EP0_FIFO_SIZE) +#define USB_EP_BULK(addr, bname, dir, cdir) \ + USB_EP_DEF(addr, bname, dir, BULK, BULK_FIFO_SIZE, BULK, cdir) +#define USB_EP_ISO(addr, bname, dir, cdir) \ + USB_EP_DEF(addr, bname, dir, ISOC, ISO_FIFO_SIZE, ISO, cdir) +#define USB_EP_INT(addr, bname, dir, cdir) \ + USB_EP_DEF(addr, bname, dir, INT, INT_FIFO_SIZE, INT, cdir) +#define USB_EP_IN_BULK(n) USB_EP_BULK(n, "ep" #n "in-bulk", 1, IN) +#define USB_EP_OUT_BULK(n) USB_EP_BULK(n, "ep" #n "out-bulk", 0, OUT) +#define USB_EP_IN_ISO(n) USB_EP_ISO(n, "ep" #n "in-iso", 1, IN) +#define USB_EP_OUT_ISO(n) USB_EP_ISO(n, "ep" #n "out-iso", 0, OUT) +#define USB_EP_IN_INT(n) USB_EP_INT(n, "ep" #n "in-int", 1, IN) +#define USB_EP_CTRL USB_EP_DEF(0, "ep0", 0, CONTROL, \ + EP0_FIFO_SIZE, CONTROL, ALL) #define PXA_EP_DEF(_idx, _addr, dir, _type, maxpkt, _config, iface, altset) \ { \ -- 1.9.1