From 8bfe3d25f432eb4af3a998bd504cb628c98784b7 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 10 Aug 2019 23:02:20 -0400 Subject: [PATCH] XHCI: Rename ERST_EHB to ERDP_BUSY for clarity's sake. No functional change intended. --- src/add-ons/kernel/busses/usb/xhci.cpp | 5 ++--- src/add-ons/kernel/busses/usb/xhci_hardware.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/busses/usb/xhci.cpp b/src/add-ons/kernel/busses/usb/xhci.cpp index e2d072deb7..2b5028c154 100644 --- a/src/add-ons/kernel/busses/usb/xhci.cpp +++ b/src/add-ons/kernel/busses/usb/xhci.cpp @@ -2378,8 +2378,8 @@ XHCI::Ring(uint8 slot, uint8 endpoint) WriteDoorReg32(XHCI_DOORBELL(slot), XHCI_DOORBELL_TARGET(endpoint) | XHCI_DOORBELL_STREAMID(0)); - /* Flush PCI posted writes */ ReadDoorReg32(XHCI_DOORBELL(slot)); + // Flush PCI writes } @@ -2829,8 +2829,7 @@ XHCI::ProcessEvents() fEventCcs = j; uint64 addr = fErst->rs_addr + i * sizeof(xhci_trb); - addr |= ERST_EHB; - WriteRunReg32(XHCI_ERDP_LO(0), (uint32)addr); + WriteRunReg32(XHCI_ERDP_LO(0), (uint32)addr | ERDP_BUSY); WriteRunReg32(XHCI_ERDP_HI(0), (uint32)(addr >> 32)); } diff --git a/src/add-ons/kernel/busses/usb/xhci_hardware.h b/src/add-ons/kernel/busses/usb/xhci_hardware.h index 711bfcb8fb..24ae8df2d7 100644 --- a/src/add-ons/kernel/busses/usb/xhci_hardware.h +++ b/src/add-ons/kernel/busses/usb/xhci_hardware.h @@ -120,7 +120,7 @@ #define XHCI_ERDP_LO(n) (0x0038 + (0x20 * (n))) #define XHCI_ERDP_HI(n) (0x003C + (0x20 * (n))) // Event Handler Busy (EHB) -#define ERST_EHB (1 << 3) +#define ERDP_BUSY (1 << 3) // Host Controller Doorbell Registers