Changeset 104569 in vbox for trunk/src/VBox/Devices

Timestamp:

May 9, 2024 2:23:46 PM (10 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163108

Message:

DevXHCI: Avoid needless conditionals when toggling the DCS bit.

File:

• trunk/src/VBox/Devices/USB/DevXHCI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/USB/DevXHCI.cpp

@@ -2966 +2966 @@
                 Log2(("Link extra-TD: Ptr=%RGp IOC=%u TC=%u CH=%u\n", xfer.link.rseg_ptr, xfer.link.ioc, xfer.link.toggle, xfer.link.chain));
                 Assert(!xfer.link.chain);
+                AssertCompile(XHCI_TRDP_DCS_MASK == 1); /* link.toggle is 0 or 1, can be used as XHCI_TRDP_DCS_MASK */
                 /* Set new TRDP but leave DCS bit alone... */
                 pEpCtx->trdp = (xfer.link.rseg_ptr & XHCI_TRDP_ADDR_MASK) | (pEpCtx->trdp & XHCI_TRDP_DCS_MASK);
                 /* ...and flip the DCS bit if required. Then update the TREP. */
-                if (xfer.link.toggle)
-                    pEpCtx->trdp = (pEpCtx->trdp & ~XHCI_TRDP_DCS_MASK) | (pEpCtx->trdp ^ XHCI_TRDP_DCS_MASK);
+                pEpCtx->trdp = pEpCtx->trdp ^ xfer.link.toggle;
                 if (!fInFlight)
                     pEpCtx->trep = pEpCtx->trdp;
@@ -3943 +3943 @@
                 ep_ctx.trep = (xfer.link.rseg_ptr & XHCI_TRDP_ADDR_MASK) | (ep_ctx.trep & XHCI_TRDP_DCS_MASK);
                 /* ...and flip the DCS bit if required. Then update the TREP. */
-                if (xfer.link.toggle)
-                    ep_ctx.trep = (ep_ctx.trep & ~XHCI_TRDP_DCS_MASK) | (ep_ctx.trep ^ XHCI_TRDP_DCS_MASK);
+                ep_ctx.trep = ep_ctx.trep ^ xfer.link.toggle;
                 rc = xhciR3WriteBackEp(pDevIns, pThis, uSlotID, uDBTarget, &ep_ctx);
                 break;