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

rndis: EP0 belongs to composite class if composite enabled

Browse Source
This commit is contained in:
raiden00pl 2023-03-23 12:55:29 +01:00 committed by Alan Carvalho de Assis
parent 8de2197773
commit bed53538e8
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/usbdev/rndis.c
View File

@ -1728,14 +1728,19 @@ static void rndis_wrcomplete(FAR struct usbdev_ep_s *ep,
static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep, static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
FAR struct usbdev_req_s *req) FAR struct usbdev_req_s *req)
{ {
struct rndis_dev_s *priv = (FAR struct rndis_dev_s *)ep->priv; FAR struct rndis_dev_s *priv;
if (req->result || req->xfrd != req->len) if (req->result || req->xfrd != req->len)
{ {
usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_REQRESULT), usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_REQRESULT),
(uint16_t)-req->result); (uint16_t)-req->result);
} }
else if (req->len > 0 && req->priv == priv->response_queue) else if (req->len > 0 && req->priv)
{ {
/* Get EP0 request private data */
priv = (FAR struct rndis_dev_s *)req->priv;
/* This transfer was from the response queue, /* This transfer was from the response queue,
* subtract remaining byte count. * subtract remaining byte count.
*/ */
@ -1761,7 +1766,7 @@ static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
} }
/**************************************************************************** /****************************************************************************
* Name: usbclass_ep0incomplete * Name: usbclass_epintin_complete
* *
* Description: * Description:
* Handle completion of interrupt IN endpoint operations * Handle completion of interrupt IN endpoint operations
@ -2122,7 +2127,9 @@ static int usbclass_bind(FAR struct usbdevclass_driver_s *driver,
* EP0). * EP0).
*/ */
#ifndef CONFIG_RNDIS_COMPOSITE
dev->ep0->priv = priv; dev->ep0->priv = priv;
#endif
/* Preallocate control request */ /* Preallocate control request */
@ -2581,7 +2588,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
FAR struct rndis_response_header *hdr = FAR struct rndis_response_header *hdr =
(struct rndis_response_header *)priv->response_queue; (struct rndis_response_header *)priv->response_queue;
memcpy(ctrlreq->buf, hdr, hdr->msglen); memcpy(ctrlreq->buf, hdr, hdr->msglen);
ctrlreq->priv = priv->response_queue; ctrlreq->priv = priv;
ret = hdr->msglen; ret = hdr->msglen;
} }
} }