sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usbdev-composite: ep0 submit should be send only once for the composite class

Browse Source
This commit is contained in:
raiden00pl 2023-03-23 17:21:25 +01:00 committed by Alan Carvalho de Assis
parent d014b9d384
commit 50cf84c99a
6 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usbdev/cdcacm.c
View File

@ -1982,7 +1982,7 @@ static int cdcacm_setup(FAR struct usbdevclass_driver_s *driver,
#ifndef CONFIG_CDCACM_COMPOSITE #ifndef CONFIG_CDCACM_COMPOSITE
ret = EP_SUBMIT(dev->ep0, ctrlreq); ret = EP_SUBMIT(dev->ep0, ctrlreq);
#else #else
ret = composite_ep0submit(driver, dev, ctrlreq); ret = composite_ep0submit(driver, dev, ctrlreq, ctrl);
#endif #endif
if (ret < 0) if (ret < 0)
{ {

28
drivers/usbdev/composite.c
View File

@ -658,7 +658,6 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
outlen); outlen);
} }
dispatched = true;
priv->config = value; priv->config = value;
} }
} }
@ -1082,14 +1081,29 @@ void composite_uninitialize(FAR void *handle)
int composite_ep0submit(FAR struct usbdevclass_driver_s *driver, int composite_ep0submit(FAR struct usbdevclass_driver_s *driver,
FAR struct usbdev_s *dev, FAR struct usbdev_s *dev,
FAR struct usbdev_req_s *ctrlreq) FAR struct usbdev_req_s *ctrlreq,
FAR const struct usb_ctrlreq_s *ctrl)
{ {
/* This function is not really necessary in the current design. However, bool ep0submit = true;
* keeping this will provide us a little flexibility in the future if
* it becomes necessary to manage the completion callbacks.
*/
return EP_SUBMIT(dev->ep0, ctrlreq); /* Some EP0 responses must be send only once from the composite class */
if ((ctrl->type & USB_REQ_TYPE_MASK) == USB_REQ_TYPE_STANDARD)
{
if (ctrl->req == USB_REQ_SETCONFIGURATION)
{
ep0submit = false;
}
}
if (ep0submit)
{
return EP_SUBMIT(dev->ep0, ctrlreq);
}
else
{
return 0;
}
} }
#endif /* CONFIG_USBDEV_COMPOSITE */ #endif /* CONFIG_USBDEV_COMPOSITE */

2
drivers/usbdev/dfu.c
View File

@ -424,7 +424,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
{ {
ctrlreq->len = (len < ret) ? len : ret; ctrlreq->len = (len < ret) ? len : ret;
ctrlreq->flags = USBDEV_REQFLAGS_NULLPKT; ctrlreq->flags = USBDEV_REQFLAGS_NULLPKT;
ret = composite_ep0submit(driver, dev, ctrlreq); ret = composite_ep0submit(driver, dev, ctrlreq, ctrl);
if (ret < 0) if (ret < 0)
{ {
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPRESPQ), (uint16_t)-ret); usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPRESPQ), (uint16_t)-ret);

2
drivers/usbdev/rndis.c
View File

@ -2586,7 +2586,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
#ifndef CONFIG_RNDIS_COMPOSITE #ifndef CONFIG_RNDIS_COMPOSITE
ret = EP_SUBMIT(dev->ep0, ctrlreq); ret = EP_SUBMIT(dev->ep0, ctrlreq);
#else #else
ret = composite_ep0submit(driver, dev, ctrlreq); ret = composite_ep0submit(driver, dev, ctrlreq, ctrl);
#endif #endif
if (ret < 0) if (ret < 0)
{ {

2
drivers/usbdev/usbmsc.c
View File

@ -816,7 +816,7 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver,
#ifndef CONFIG_USBMSC_COMPOSITE #ifndef CONFIG_USBMSC_COMPOSITE
ret = EP_SUBMIT(dev->ep0, ctrlreq); ret = EP_SUBMIT(dev->ep0, ctrlreq);
#else #else
ret = composite_ep0submit(driver, dev, ctrlreq); ret = composite_ep0submit(driver, dev, ctrlreq, ctrl);
#endif #endif
if (ret < 0) if (ret < 0)
{ {

4
include/nuttx/usb/composite.h
View File

@ -130,10 +130,12 @@ void composite_uninitialize(FAR void *handle);
struct usbdevclass_driver_s; struct usbdevclass_driver_s;
struct usbdev_s; struct usbdev_s;
struct usbdev_req_s; struct usbdev_req_s;
struct usb_ctrlreq_s;
int composite_ep0submit(FAR struct usbdevclass_driver_s *driver, int composite_ep0submit(FAR struct usbdevclass_driver_s *driver,
FAR struct usbdev_s *dev, FAR struct usbdev_s *dev,
FAR struct usbdev_req_s *ctrlreq); FAR struct usbdev_req_s *ctrlreq,
FAR const struct usb_ctrlreq_s *ctrl);
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)