Message ID | e2638d6e4d38f97b46bee58b2c79a93b29b5718c.1589403150.git.andreyknvl@google.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | eccba1edeebf0cf4525a680e1585ccf97dfc4c87 |
Headers | show |
Series | USB: dummy-hcd: use configurable endpoint naming scheme | expand |
On Wed, May 13, 2020 at 10:52:56PM +0200, Andrey Konovalov wrote: > From: Andrey Konovalov <andreyknvl@gmail.com> > > USB gadget subsystem uses the following naming convention for UDC > endpoints: > > - "ep-a" names for fully configurable endpoints (address, direction and > transfer type can be changed); > > - "ep1in", "ep12out-bulk" names for fixed function endpoints (fixed > address, direction and/or transfer type). > > Dummy UDC endpoints are capable of full configuration, but named using > the second scheme. > > This patch changes the names of generic Dummy UDC endpoints to "ep-aout", > "ep-bin", etc., to advertise that they have configurable addresses and > transfer types (except that Dummy UDC doesn't support ISO transfers), but > fixed direction. > > This is required for Raw Gadget (and perhaps for some other drivers), > that reasons about whether an endpoint has configurable address based > on its name. > > Suggested-by: Alan Stern <stern@rowland.harvard.edu> > Signed-off-by: Andrey Konovalov <andreyknvl@google.com> > --- > drivers/usb/gadget/udc/dummy_hcd.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c > index 6e3e3ebf715f..7402ef0d66d2 100644 > --- a/drivers/usb/gadget/udc/dummy_hcd.c > +++ b/drivers/usb/gadget/udc/dummy_hcd.c > @@ -187,31 +187,31 @@ static const struct { > USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_IN)), > > /* and now some generic EPs so we have enough in multi config */ > - EP_INFO("ep3out", > + EP_INFO("ep-aout", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), > - EP_INFO("ep4in", > + EP_INFO("ep-bin", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), > - EP_INFO("ep5out", > + EP_INFO("ep-cout", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), > - EP_INFO("ep6out", > + EP_INFO("ep-dout", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), > - EP_INFO("ep7in", > + EP_INFO("ep-ein", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), > - EP_INFO("ep8out", > + EP_INFO("ep-fout", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), > - EP_INFO("ep9in", > + EP_INFO("ep-gin", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), > - EP_INFO("ep10out", > + EP_INFO("ep-hout", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), > - EP_INFO("ep11out", > + EP_INFO("ep-iout", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), > - EP_INFO("ep12in", > + EP_INFO("ep-jin", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), > - EP_INFO("ep13out", > + EP_INFO("ep-kout", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), > - EP_INFO("ep14in", > + EP_INFO("ep-lin", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), > - EP_INFO("ep15out", > + EP_INFO("ep-mout", > USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), > > #undef EP_INFO Acked-by: Alan Stern <stern@rowland.harvard.edu>
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c index 6e3e3ebf715f..7402ef0d66d2 100644 --- a/drivers/usb/gadget/udc/dummy_hcd.c +++ b/drivers/usb/gadget/udc/dummy_hcd.c @@ -187,31 +187,31 @@ static const struct { USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK, USB_EP_CAPS_DIR_IN)), /* and now some generic EPs so we have enough in multi config */ - EP_INFO("ep3out", + EP_INFO("ep-aout", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), - EP_INFO("ep4in", + EP_INFO("ep-bin", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), - EP_INFO("ep5out", + EP_INFO("ep-cout", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), - EP_INFO("ep6out", + EP_INFO("ep-dout", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), - EP_INFO("ep7in", + EP_INFO("ep-ein", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), - EP_INFO("ep8out", + EP_INFO("ep-fout", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), - EP_INFO("ep9in", + EP_INFO("ep-gin", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), - EP_INFO("ep10out", + EP_INFO("ep-hout", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), - EP_INFO("ep11out", + EP_INFO("ep-iout", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), - EP_INFO("ep12in", + EP_INFO("ep-jin", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), - EP_INFO("ep13out", + EP_INFO("ep-kout", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), - EP_INFO("ep14in", + EP_INFO("ep-lin", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_IN)), - EP_INFO("ep15out", + EP_INFO("ep-mout", USB_EP_CAPS(TYPE_BULK_OR_INT, USB_EP_CAPS_DIR_OUT)), #undef EP_INFO