Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAMA5D2. Fix DEBUGASSERT triggered in sam_updhs.c #14128

Merged
merged 1 commit into from
Oct 12, 2024
Merged

SAMA5D2. Fix DEBUGASSERT triggered in sam_updhs.c #14128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions arch/arm/src/sama5/sam_udphs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2374,11 +2374,6 @@ static void sam_dma_interrupt(struct sam_usbdev_s *priv, int epno)

privep = &priv->eplist[epno];

/* Get the request from the head of the endpoint request queue */

privreq = sam_rqpeek(&privep->reqq);
DEBUGASSERT(privreq);

/* Get the result of the DMA operation */

dmastatus = sam_getreg(SAM_UDPHS_DMASTATUS(epno));
Expand Down Expand Up @@ -2439,7 +2434,12 @@ static void sam_dma_interrupt(struct sam_usbdev_s *priv, int epno)
}
else if (privep->epstate == UDPHS_EPSTATE_RECEIVING)
{
/* privreg->inflight holds the total transfer size */
/* privreg->inflight holds the total transfer size
* Get the request from the head of the endpoint request queue
*/

privreq = sam_rqpeek(&privep->reqq);
DEBUGASSERT(privreq);

xfrsize = privreq->inflight;
privreq->inflight = 0;
Expand Down Expand Up @@ -2495,8 +2495,13 @@ static void sam_dma_interrupt(struct sam_usbdev_s *priv, int epno)
* BUFF_COUNT should not be zero. BUFF_COUNT was set to the
* 'inflight' count when the DMA started so the difference will
* give us the actual size of the transfer.
*
* Get the request from the head of the endpoint request queue first.
*/

privreq = sam_rqpeek(&privep->reqq);
DEBUGASSERT(privreq);

bufcnt = ((dmastatus & UDPHS_DMASTATUS_BUFCNT_MASK)
>> UDPHS_DMASTATUS_BUFCNT_SHIFT);
xfrsize = privreq->inflight - bufcnt;
Expand Down
Loading