grstctl set fifo + flush in one assign

hathach · hathach · commit 6e7cd220dc60 · 2022-06-01T13:18:24.000+07:00
diff --git a/src/portable/synopsys/dwc2/dcd_dwc2.c b/src/portable/synopsys/dwc2/dcd_dwc2.c
@@ -796,8 +796,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
`@@ -796,8 +796,7 @@ static void dcd_edpt_disable (uint8_t rhport, uint8_t ep_addr, bool stall)`
`796`	`796`	`}`
`797`	`797`
`798`	`798`	`// Flush the FIFO, and wait until we have confirmed it cleared.`
`799`		`- dwc2->grstctl = (epnum << GRSTCTL_TXFNUM_Pos);`
`800`		`- dwc2->grstctl \|= GRSTCTL_TXFFLSH;`
	`799`	`+ dwc2->grstctl = ((epnum << GRSTCTL_TXFNUM_Pos) \| GRSTCTL_TXFFLSH);`
`801`	`800`	`while ( (dwc2->grstctl & GRSTCTL_TXFFLSH_Msk) != 0 ) {}`
`802`	`801`	`}`
`803`	`802`	`else`