Merge pull request #2463 from kasjer/kasjer/nrf5x-isoout-corruption-detection

hathach · web-flow · commit 65e60f3123a6 · 2024-02-20T14:06:08.000+07:00
nrf5x: Handle ISOOUT CRC errors
diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c
@@ -653,7 +653,11 @@ void dcd_int_handler(uint8_t rhport)
     if (NRF_USBD->EPOUTEN & USBD_EPOUTEN_ISOOUT_Msk)
     {
       iso_enabled = true;
-      xact_out_dma(EP_ISO_NUM);
+      // Transfer from endpoint to RAM only if data is not corrupted
+      if ((int_status & USBD_INTEN_USBEVENT_Msk) == 0 ||
+          (NRF_USBD->EVENTCAUSE & USBD_EVENTCAUSE_ISOOUTCRC_Msk) == 0) {
+        xact_out_dma(EP_ISO_NUM);
+      }
     }
 
     // ISOIN: Notify client that data was transferred
@@ -683,7 +687,7 @@ void dcd_int_handler(uint8_t rhport)
   {
     TU_LOG(2, "EVENTCAUSE = 0x%04lX\r\n", NRF_USBD->EVENTCAUSE);
 
-    enum { EVT_CAUSE_MASK = USBD_EVENTCAUSE_SUSPEND_Msk | USBD_EVENTCAUSE_RESUME_Msk | USBD_EVENTCAUSE_USBWUALLOWED_Msk };
+    enum { EVT_CAUSE_MASK = USBD_EVENTCAUSE_SUSPEND_Msk | USBD_EVENTCAUSE_RESUME_Msk | USBD_EVENTCAUSE_USBWUALLOWED_Msk | USBD_EVENTCAUSE_ISOOUTCRC_Msk };
     uint32_t const evt_cause = NRF_USBD->EVENTCAUSE & EVT_CAUSE_MASK;
     NRF_USBD->EVENTCAUSE = evt_cause; // clear interrupt
 

Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,11 @@ void dcd_int_handler(uint8_t rhport)`
`653`	`653`	`if (NRF_USBD->EPOUTEN & USBD_EPOUTEN_ISOOUT_Msk)`
`654`	`654`	`{`
`655`	`655`	`iso_enabled = true;`
`656`		`- xact_out_dma(EP_ISO_NUM);`
	`656`	`+ // Transfer from endpoint to RAM only if data is not corrupted`
	`657`	`+ if ((int_status & USBD_INTEN_USBEVENT_Msk) == 0 \|\|`
	`658`	`+ (NRF_USBD->EVENTCAUSE & USBD_EVENTCAUSE_ISOOUTCRC_Msk) == 0) {`
	`659`	`+ xact_out_dma(EP_ISO_NUM);`
	`660`	`+ }`
`657`	`661`	`}`
`658`	`662`
`659`	`663`	`// ISOIN: Notify client that data was transferred`
`@@ -683,7 +687,7 @@ void dcd_int_handler(uint8_t rhport)`
`683`	`687`	`{`
`684`	`688`	`TU_LOG(2, "EVENTCAUSE = 0x%04lX\r\n", NRF_USBD->EVENTCAUSE);`
`685`	`689`
`686`		`- enum { EVT_CAUSE_MASK = USBD_EVENTCAUSE_SUSPEND_Msk \| USBD_EVENTCAUSE_RESUME_Msk \| USBD_EVENTCAUSE_USBWUALLOWED_Msk };`
	`690`	`+ enum { EVT_CAUSE_MASK = USBD_EVENTCAUSE_SUSPEND_Msk \| USBD_EVENTCAUSE_RESUME_Msk \| USBD_EVENTCAUSE_USBWUALLOWED_Msk \| USBD_EVENTCAUSE_ISOOUTCRC_Msk };`
`687`	`691`	`uint32_t const evt_cause = NRF_USBD->EVENTCAUSE & EVT_CAUSE_MASK;`
`688`	`692`	`NRF_USBD->EVENTCAUSE = evt_cause; // clear interrupt`
`689`	`693`