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

Fix sam_udphs to allow RNDIS to work

Browse Source 
Update sam_udphs.c
This commit is contained in:
TimJTi 2023-02-08 16:17:36 +00:00 committed by Xiang Xiao
parent 9638187192
commit b3365858ee
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/src/sama5/sam_udphs.c
View File

@ -371,9 +371,13 @@ struct sam_usbdev_s
* of valid dat in the buffer is given by ctrlreg.len[]. For the * of valid dat in the buffer is given by ctrlreg.len[]. For the
* case of EP0 SETUP IN transaction, the normal request mechanism is * case of EP0 SETUP IN transaction, the normal request mechanism is
* used and the class driver provides the buffering. * used and the class driver provides the buffering.
*
* A buffer 4* the EP0_MAXPACKETSIZE is used to allow for data that
* is sent in consecutive packets although for the same transaction.
*/ */
uint8_t ep0out[SAM_EP0_MAXPACKET]; uint8_t ep0out[4 * SAM_EP0_MAXPACKET];
uint16_t ep0datlen;
}; };
/**************************************************************************** /****************************************************************************
@ -2637,10 +2641,6 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
{ {
uint16_t len; uint16_t len;
/* Yes.. back to the IDLE state */
privep->epstate = UDPHS_EPSTATE_IDLE;
/* Get the size of the packet that we just received */ /* Get the size of the packet that we just received */
pktsize = (uint16_t) pktsize = (uint16_t)
@ -2650,27 +2650,32 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
/* Get the size that we expected to receive */ /* Get the size that we expected to receive */
len = GETUINT16(priv->ctrl.len); len = GETUINT16(priv->ctrl.len);
if (len == pktsize)
/* Copy the OUT data from the EP0 FIFO into the EP0 buffer. */
sam_ep0_read(priv->ep0out + priv->ep0datlen, pktsize);
priv->ep0datlen += pktsize;
if (priv->ep0datlen == len)
{ {
/* Copy the OUT data from the EP0 FIFO into a special EP0 /* Back to the IDLE state and clear RXRDYTXKL
* buffer and clear RXRDYTXKL in order to receive more data. * in order to receive more data.
*/ */
sam_ep0_read(priv->ep0out, len); privep->epstate = UDPHS_EPSTATE_IDLE;
sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno)); sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno));
/* And handle the EP0 SETUP now. */ /* And handle the EP0 SETUP now. */
sam_ep0_setup(priv); sam_ep0_setup(priv);
priv->ep0datlen = 0;
} }
else else
{ {
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_EP0SETUPOUTSIZE), /* Clear RXRDYTXKL in order to receive more data. */
pktsize);
/* STALL and discard received data. */
sam_ep_stall(&privep->ep, false);
sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno)); sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno));
} }
} }