MdeModulePkg: The patch eliminates two assumptions

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / XhciDxe / Xhci.h

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
index 3793d9c1c25cbca4c7497cce74d5b83f1258298e..f6da016bfb8ee8589b8105cb40d44248265600d9 100644 (file)
--- 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)\r
 \r
 #define XHC_LOW_32BIT(Addr64)          ((UINT32)(((UINTN)(Addr64)) & 0xFFFFFFFF))\r
-#define XHC_HIGH_32BIT(Addr64)         ((UINT32)(RShiftU64((UINTN)(Addr64), 32) & 0xFFFFFFFF))\r
+#define XHC_HIGH_32BIT(Addr64)         ((UINT32)(RShiftU64((UINT64)(UINTN)(Addr64), 32) & 0xFFFFFFFF))\r
 #define XHC_BIT_IS_SET(Data, Bit)      ((BOOLEAN)(((Data) & (Bit)) == (Bit)))\r
 \r
 #define XHC_REG_BIT_IS_SET(Xhc, Offset, Bit) \\r
@@ -228,25 +228,9 @@ struct _USB_XHCI_INSTANCE {
   //\r
   TRANSFER_RING             CmdRing;\r
   //\r
-  // CmdEventRing\r
+  // EventRing\r
   //\r
-  EVENT_RING                CmdEventRing;\r
-  //\r
-  // ControlTREventRing\r
-  //\r
-  EVENT_RING                CtrlTrEventRing;\r
-  //\r
-  // BulkTREventRing\r
-  //\r
-  EVENT_RING                BulkTrEventRing;\r
-  //\r
-  // IntTREventRing\r
-  //\r
-  EVENT_RING                IntTrEventRing;\r
-  //\r
-  // AsyncIntTREventRing\r
-  //\r
-  EVENT_RING                AsynIntTrEventRing;\r
+  EVENT_RING                EventRing;\r
   //\r
   // Misc\r
   //\r