Merge pull request hathach#1454 from Iktek/bugfix_1453

hathach · web-flow · commit fd8afc7e3b55 · 2022-06-01T14:36:36.000+07:00
overwrite grstctl on edpt_disable
diff --git a/src/portable/synopsys/dwc2/dcd_dwc2.c b/src/portable/synopsys/dwc2/dcd_dwc2.c
@@ -819,8 +819,7 @@ static void dcd_edpt_disable (uint8_t rhport, uint8_t ep_addr, bool stall)
     }
 
     // Flush the FIFO, and wait until we have confirmed it cleared.
-    dwc2->grstctl |= (epnum << GRSTCTL_TXFNUM_Pos);
-    dwc2->grstctl |= GRSTCTL_TXFFLSH;
+    dwc2->grstctl = ((epnum << GRSTCTL_TXFNUM_Pos) | GRSTCTL_TXFFLSH);
     while ( (dwc2->grstctl & GRSTCTL_TXFFLSH_Msk) != 0 ) {}
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -819,8 +819,7 @@ static void dcd_edpt_disable (uint8_t rhport, uint8_t ep_addr, bool stall)`
`819`	`819`	`}`
`820`	`820`
`821`	`821`	`// Flush the FIFO, and wait until we have confirmed it cleared.`
`822`		`- dwc2->grstctl \|= (epnum << GRSTCTL_TXFNUM_Pos);`
`823`		`- dwc2->grstctl \|= GRSTCTL_TXFFLSH;`
	`822`	`+ dwc2->grstctl = ((epnum << GRSTCTL_TXFNUM_Pos) \| GRSTCTL_TXFFLSH);`
`824`	`823`	`while ( (dwc2->grstctl & GRSTCTL_TXFFLSH_Msk) != 0 ) {}`
`825`	`824`	`}`
`826`	`825`	`else`