1 files changed, 3 insertions, 19 deletions
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
index 3793d9c1c2..f6da016bfb 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
@@ -93,7 +93,7 @@ typedef struct _USB_DEV_CONTEXT      USB_DEV_CONTEXT;
 #define EFI_LIST_CONTAINER(Entry, Type, Field) BASE_CR(Entry, Type, Field)
 
 #define XHC_LOW_32BIT(Addr64)          ((UINT32)(((UINTN)(Addr64)) & 0xFFFFFFFF))
-#define XHC_HIGH_32BIT(Addr64)         ((UINT32)(RShiftU64((UINTN)(Addr64), 32) & 0xFFFFFFFF))
+#define XHC_HIGH_32BIT(Addr64)         ((UINT32)(RShiftU64((UINT64)(UINTN)(Addr64), 32) & 0xFFFFFFFF))
 #define XHC_BIT_IS_SET(Data, Bit)      ((BOOLEAN)(((Data) & (Bit)) == (Bit)))
 
 #define XHC_REG_BIT_IS_SET(Xhc, Offset, Bit) \
@@ -228,25 +228,9 @@ struct _USB_XHCI_INSTANCE {
   //
   TRANSFER_RING             CmdRing;
   //
-  // CmdEventRing
+  // EventRing
   //
-  EVENT_RING                CmdEventRing;
-  //
-  // ControlTREventRing
-  //
-  EVENT_RING                CtrlTrEventRing;
-  //
-  // BulkTREventRing
-  //
-  EVENT_RING                BulkTrEventRing;
-  //
-  // IntTREventRing
-  //
-  EVENT_RING                IntTrEventRing;
-  //
-  // AsyncIntTREventRing
-  //
-  EVENT_RING                AsynIntTrEventRing;
+  EVENT_RING                EventRing;
   //
   // Misc
   //