Merge pull request hathach#1946 from kasjer/kasjer/nrf5x-fix-iso-memory-corruption

hathach · web-flow · commit b5b2fad5fba5 · 2023-03-11T08:06:17.000+07:00
dcd_nrf5x: ISO OUT handling
diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c
@@ -187,11 +187,16 @@ static void xact_out_dma(uint8_t epnum)
     }
     else
     {
-      // Trigger DMA move data from Endpoint -> SRAM
-      NRF_USBD->ISOOUT.PTR = (uint32_t) xfer->buffer;
-      NRF_USBD->ISOOUT.MAXCNT = xact_len;
+      if (xfer->started)
+      {
+        // Trigger DMA move data from Endpoint -> SRAM
+        NRF_USBD->ISOOUT.PTR = (uint32_t) xfer->buffer;
+        NRF_USBD->ISOOUT.MAXCNT = xact_len;
 
-      start_dma(&NRF_USBD->TASKS_STARTISOOUT);
+        start_dma(&NRF_USBD->TASKS_STARTISOOUT);
+      } else {
+        atomic_flag_clear(&_dcd.dma_running);
+      }
     }
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -187,11 +187,16 @@ static void xact_out_dma(uint8_t epnum)`
`187`	`187`	`}`
`188`	`188`	`else`
`189`	`189`	`{`
`190`		`- // Trigger DMA move data from Endpoint -> SRAM`
`191`		`- NRF_USBD->ISOOUT.PTR = (uint32_t) xfer->buffer;`
`192`		`- NRF_USBD->ISOOUT.MAXCNT = xact_len;`
	`190`	`+ if (xfer->started)`
	`191`	`+ {`
	`192`	`+ // Trigger DMA move data from Endpoint -> SRAM`
	`193`	`+ NRF_USBD->ISOOUT.PTR = (uint32_t) xfer->buffer;`
	`194`	`+ NRF_USBD->ISOOUT.MAXCNT = xact_len;`
`193`	`195`
`194`		`- start_dma(&NRF_USBD->TASKS_STARTISOOUT);`
	`196`	`+ start_dma(&NRF_USBD->TASKS_STARTISOOUT);`
	`197`	`+ } else {`
	`198`	`+ atomic_flag_clear(&_dcd.dma_running);`
	`199`	`+ }`
`195`	`200`	`}`
`196`	`201`	`}`
`197`	`202`	`else`