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

USBDEV RNDIS: Fix style and printf issues

Browse Source
This commit is contained in:
Petteri Aimonen 2021-03-24 11:07:42 +02:00 committed by Alan Carvalho de Assis
parent 94480305a7
commit d0c6104efb
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/usbdev/rndis.c
View File

@ -1358,7 +1358,7 @@ static inline int rndis_recvpacket(FAR struct rndis_dev_s *priv,
* *
****************************************************************************/ ****************************************************************************/
static FAR void* static FAR void *
rndis_prepare_response(FAR struct rndis_dev_s *priv, size_t size, rndis_prepare_response(FAR struct rndis_dev_s *priv, size_t size,
FAR struct rndis_command_header *request_hdr) FAR struct rndis_command_header *request_hdr)
{ {
@ -1368,7 +1368,8 @@ rndis_prepare_response(FAR struct rndis_dev_s *priv, size_t size,
if (priv->response_queue_bytes + size > RNDIS_RESP_QUEUE_LEN) if (priv->response_queue_bytes + size > RNDIS_RESP_QUEUE_LEN)
{ {
uerr("RNDIS response queue full, dropping command %08x", request_hdr->msgtype); uerr("RNDIS response queue full, dropping command %08x",
(unsigned int)request_hdr->msgtype);
return NULL; return NULL;
} }
@ -1395,16 +1396,19 @@ rndis_prepare_response(FAR struct rndis_dev_s *priv, size_t size,
* *
****************************************************************************/ ****************************************************************************/
static int rndis_send_encapsulated_response(FAR struct rndis_dev_s *priv, size_t size) static int rndis_send_encapsulated_response(FAR struct rndis_dev_s *priv,
size_t size)
{ {
FAR struct rndis_notification *notif = FAR struct rndis_notification *notif =
(FAR struct rndis_notification *)priv->epintin_req->buf; (FAR struct rndis_notification *)priv->epintin_req->buf;
/* Mark the response as available in the queue */ /* Mark the response as available in the queue */
priv->response_queue_bytes += size; priv->response_queue_bytes += size;
DEBUGASSERT(priv->response_queue_bytes <= RNDIS_RESP_QUEUE_LEN); DEBUGASSERT(priv->response_queue_bytes <= RNDIS_RESP_QUEUE_LEN);
/* Send notification on IRQ endpoint, to tell host to read the data. */ /* Send notification on IRQ endpoint, to tell host to read the data. */
notif->notification = RNDIS_NOTIFICATION_RESPONSE_AVAILABLE; notif->notification = RNDIS_NOTIFICATION_RESPONSE_AVAILABLE;
notif->reserved = 0; notif->reserved = 0;
priv->epintin_req->len = sizeof(struct rndis_notification); priv->epintin_req->len = sizeof(struct rndis_notification);
@ -1441,10 +1445,9 @@ static int rndis_handle_control_message(FAR struct rndis_dev_s *priv,
case RNDIS_INITIALIZE_MSG: case RNDIS_INITIALIZE_MSG:
{ {
FAR struct rndis_initialize_cmplt *resp; FAR struct rndis_initialize_cmplt *resp;
size_t respsize = sizeof(struct rndis_initialize_cmplt);
resp = rndis_prepare_response(priv, resp = rndis_prepare_response(priv, respsize, cmd_hdr);
sizeof(struct rndis_initialize_cmplt),
cmd_hdr);
if (!resp) if (!resp)
{ {
return -ENOMEM; return -ENOMEM;
@ -1458,7 +1461,7 @@ static int rndis_handle_control_message(FAR struct rndis_dev_s *priv,
resp->xfrsize = (4 + 44 + 22) + RNDIS_BUFFER_SIZE; resp->xfrsize = (4 + 44 + 22) + RNDIS_BUFFER_SIZE;
resp->pktalign = 2; resp->pktalign = 2;
rndis_send_encapsulated_response(priv, resp->hdr.msglen); rndis_send_encapsulated_response(priv, respsize);
} }
break; break;
@ -1565,9 +1568,9 @@ static int rndis_handle_control_message(FAR struct rndis_dev_s *priv,
{ {
FAR struct rndis_set_msg *req; FAR struct rndis_set_msg *req;
FAR struct rndis_response_header *resp; FAR struct rndis_response_header *resp;
size_t respsize = sizeof(struct rndis_response_header);
resp = rndis_prepare_response(priv, sizeof(struct rndis_response_header), resp = rndis_prepare_response(priv, respsize, cmd_hdr);
cmd_hdr);
req = (FAR struct rndis_set_msg *)dataout; req = (FAR struct rndis_set_msg *)dataout;
if (!resp) if (!resp)
@ -1603,17 +1606,17 @@ static int rndis_handle_control_message(FAR struct rndis_dev_s *priv,
resp->status = RNDIS_STATUS_NOT_SUPPORTED; resp->status = RNDIS_STATUS_NOT_SUPPORTED;
} }
rndis_send_encapsulated_response(priv, resp->msglen); rndis_send_encapsulated_response(priv, respsize);
} }
break; break;
case RNDIS_RESET_MSG: case RNDIS_RESET_MSG:
{ {
FAR struct rndis_reset_cmplt *resp; FAR struct rndis_reset_cmplt *resp;
size_t respsize = sizeof(struct rndis_reset_cmplt);
priv->response_queue_bytes = 0; priv->response_queue_bytes = 0;
resp = rndis_prepare_response(priv, sizeof(struct rndis_reset_cmplt), resp = rndis_prepare_response(priv, respsize, cmd_hdr);
cmd_hdr);
if (!resp) if (!resp)
{ {
@ -1622,21 +1625,21 @@ static int rndis_handle_control_message(FAR struct rndis_dev_s *priv,
resp->addreset = 0; resp->addreset = 0;
priv->connected = false; priv->connected = false;
rndis_send_encapsulated_response(priv, resp->hdr.msglen); rndis_send_encapsulated_response(priv, respsize);
} }
break; break;
case RNDIS_KEEPALIVE_MSG: case RNDIS_KEEPALIVE_MSG:
{ {
FAR struct rndis_response_header *resp; FAR struct rndis_response_header *resp;
resp = rndis_prepare_response(priv, sizeof(struct rndis_response_header), size_t respsize = sizeof(struct rndis_response_header);
cmd_hdr); resp = rndis_prepare_response(priv, respsize, cmd_hdr);
if (!resp) if (!resp)
{ {
return -ENOMEM; return -ENOMEM;
} }
rndis_send_encapsulated_response(priv, resp->msglen); rndis_send_encapsulated_response(priv, respsize);
} }
break; break;
@ -1787,18 +1790,24 @@ static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
} }
else if (req->len > 0 && req->priv == priv->response_queue) else if (req->len > 0 && req->priv == priv->response_queue)
{ {
/* This transfer was from the response queue, subtract remaining byte count. */ /* This transfer was from the response queue,
* subtract remaining byte count.
*/
req->priv = 0; req->priv = 0;
if (req->len >= priv->response_queue_bytes) if (req->len >= priv->response_queue_bytes)
{ {
/* Queue now empty */ /* Queue now empty */
priv->response_queue_bytes = 0; priv->response_queue_bytes = 0;
} }
else else
{ {
/* Copy the remaining responses to beginning of buffer. */ /* Copy the remaining responses to beginning of buffer. */
priv->response_queue_bytes -= req->len; priv->response_queue_bytes -= req->len;
memcpy(priv->response_queue, priv->response_queue + req->len, priv->response_queue_bytes); memcpy(priv->response_queue, priv->response_queue + req->len,
priv->response_queue_bytes);
} }
} }
} }
@ -2248,6 +2257,7 @@ static int usbclass_bind(FAR struct usbdevclass_driver_s *driver,
} }
/* Initialize response queue to empty */ /* Initialize response queue to empty */
priv->response_queue_bytes = 0; priv->response_queue_bytes = 0;
/* Report if we are selfpowered */ /* Report if we are selfpowered */
@ -2533,13 +2543,19 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
{ {
if (priv->response_queue_bytes == 0) if (priv->response_queue_bytes == 0)
{ {
/* No reply available is indicated with a single 0x00 byte. */ /* No reply available is indicated with a single
* 0x00 byte.
*/
ret = 1; ret = 1;
ctrlreq->buf[0] = 0; ctrlreq->buf[0] = 0;
} }
else else
{ {
/* Retrieve a single reply from the response queue to control request buffer. */ /* Retrieve a single reply from the response queue to
* control request buffer.
*/
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);