Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SAMA5 UDPHS: Fix error where bit was not cleared to acknowledge receipt of data and to setup for the next incoming data

Browse Source
This commit is contained in:
Gregory Nutt
2014-04-06 13:13:31 -06:00
parent 4d25119e62
commit 177cb595d5
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -7145,4 +7145,6 @@
* nuttx/arch/arm/src/armv7-a/mmu.h: Bufferable bit did not do what * nuttx/arch/arm/src/armv7-a/mmu.h: Bufferable bit did not do what
I thought it was going to do. Result was the NOR FLASH accesses I thought it was going to do. Result was the NOR FLASH accesses
were very slow (2014-4-3). were very slow (2014-4-3).
* arch/arm/src/sama5/sam_udphs.c: Fix a case where received status
was not clear, causing OUT SETUP commands to fail (2014-4-6).
arch/arm/src/sama5/sam_udphs.c
+17 -4
View File
@@ -2587,7 +2587,9 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
((eptsta & UDPHS_EPTSTA_BYTECNT_MASK) >> ((eptsta & UDPHS_EPTSTA_BYTECNT_MASK) >>
UDPHS_EPTSTA_BYTECNT_SHIFT); UDPHS_EPTSTA_BYTECNT_SHIFT);
/* And continue processing the read request */ /* And continue processing the read request, clearing RXRDYTXKL in
* order to receive more data.
*/
privep->epstate = UDPHS_EPSTATE_IDLE; privep->epstate = UDPHS_EPSTATE_IDLE;
sam_req_read(priv, privep, pktsize); sam_req_read(priv, privep, pktsize);
@@ -2615,9 +2617,12 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
len = GETUINT16(priv->ctrl.len); len = GETUINT16(priv->ctrl.len);
if (len == pktsize) if (len == pktsize)
{ {
/* Copy the OUT data from the EP0 FIFO into special EP0 buffer. */ /* Copy the OUT data from the EP0 FIFO into special EP0 buffer
* and clear RXRDYTXKL in order to receive more data.
*/
sam_ep0_read(priv->ep0out, len); sam_ep0_read(priv->ep0out, len);
sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno));
/* And handle the EP0 SETUP now. */ /* And handle the EP0 SETUP now. */
@@ -2626,7 +2631,11 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
else else
{ {
usbtrace(TRACE_DEVERROR(SAM_TRACEERR_EP0SETUPOUTSIZE), pktsize); usbtrace(TRACE_DEVERROR(SAM_TRACEERR_EP0SETUPOUTSIZE), pktsize);
/* STALL and discard received data. */
(void)sam_ep_stall(&privep->ep, false); (void)sam_ep_stall(&privep->ep, false);
sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno));
} }
} }
else else
@@ -2636,14 +2645,12 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
if (eptype == UDPHS_EPTCFG_TYPE_CTRL8 && if (eptype == UDPHS_EPTCFG_TYPE_CTRL8 &&
(eptsta & UDPHS_EPTSTA_BYTECNT_MASK) == 0) (eptsta & UDPHS_EPTSTA_BYTECNT_MASK) == 0)
{ {
sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno));
} }
/* Data has been STALLed */ /* Data has been STALLed */
else if ((eptsta & UDPHS_EPTSTA_FRCESTALL) != 0) else if ((eptsta & UDPHS_EPTSTA_FRCESTALL) != 0)
{ {
sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno));
} }
/* NAK the data */ /* NAK the data */
@@ -2654,6 +2661,12 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
regval &= ~UDPHS_INT_EPT(epno); regval &= ~UDPHS_INT_EPT(epno);
sam_putreg(regval, SAM_UDPHS_IEN); sam_putreg(regval, SAM_UDPHS_IEN);
} }
/* Discard any received data and clear UDPHS_EPTSTA_RXRDYTXKL so that we
* may receive more data.
*/
sam_putreg(UDPHS_EPTSTA_RXRDYTXKL, SAM_UDPHS_EPTCLRSTA(epno));
} }
} }