Removed GLOBAL_REMOVE_IF_UNREFENRENCED because it will cause compiler failure.

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / Ehci / Dxe / Ehci.h

diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h
index bb7060bba7e065c7b3bb6543060fcc6c14c1c775..035d3302bd502489a0a18fbc89b6a987a85b3d16 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h
+++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.h
@@ -27,9 +27,11 @@ Revision History
 //\r
 #include <IndustryStandard/pci22.h>\r
 \r
+\r
 extern UINTN  gEHCDebugLevel;\r
 extern UINTN  gEHCErrorLevel;\r
 \r
+\r
 #define STALL_1_MACRO_SECOND              1\r
 #define STALL_1_MILLI_SECOND              1000 * STALL_1_MACRO_SECOND\r
 #define STALL_1_SECOND                    1000 * STALL_1_MILLI_SECOND\r
@@ -192,10 +194,10 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gEhciComponentName;
 #define OUTPUT_PACKET_ID        0xE1\r
 #define ERROR_PACKET_ID         0x55\r
 \r
-#define bit(a)                1 << (a)\r
+#define bit(a)                  (1 << (a))\r
 \r
-#define GET_0B_TO_31B(Addr)   (((UINTN) Addr) & (0xffffffff))\r
-#define GET_32B_TO_63B(Addr)  ((((UINTN) Addr) >> 32) & (0xffffffff))\r
+#define GET_0B_TO_31B(Addr)     (((UINTN) Addr) & (0xffffffff))\r
+#define GET_32B_TO_63B(Addr)    ((UINTN)RShiftU64((UINTN) Addr, 32) & (0xffffffff))\r
 \r
 \r
 //\r
@@ -326,7 +328,7 @@ typedef struct _EHCI_QTD_ENTITY     EHCI_QTD_ENTITY;
 typedef struct _EHCI_QH_ENTITY      EHCI_QH_ENTITY;\r
 typedef struct _EHCI_ASYNC_REQUEST  EHCI_ASYNC_REQUEST;\r
 \r
-typedef struct _EHCI_QTD_ENTITY {\r
+struct _EHCI_QTD_ENTITY {\r
   EHCI_QTD_HW     Qtd;\r
   UINT32          TotalBytes;\r
   UINT32          StaticTotalBytes;\r
@@ -335,9 +337,9 @@ typedef struct _EHCI_QTD_ENTITY {
   EHCI_QTD_ENTITY *Next;\r
   EHCI_QTD_ENTITY *AltNext;\r
   EHCI_QH_ENTITY  *SelfQh;\r
-} EHCI_QTD_ENTITY;\r
+};\r
 \r
-typedef struct _EHCI_QH_ENTITY {\r
+struct _EHCI_QH_ENTITY {\r
   EHCI_QH_HW      Qh;\r
   EHCI_QH_ENTITY  *Next;\r
   EHCI_QH_ENTITY  *Prev;\r
@@ -346,7 +348,7 @@ typedef struct _EHCI_QH_ENTITY {
   EHCI_QTD_ENTITY *AltQtdPtr;\r
   UINTN           Interval;\r
   UINT8           TransferType;\r
-} EHCI_QH_ENTITY;\r
+};\r
 \r
 #define GET_QH_ENTITY_ADDR(a)   ((EHCI_QH_ENTITY *) a)\r
 #define GET_QTD_ENTITY_ADDR(a)  ((EHCI_QTD_ENTITY *) a)\r
@@ -359,19 +361,14 @@ typedef struct _EHCI_QH_ENTITY {
 \r
 #define USB2_HC_DEV_SIGNATURE     EFI_SIGNATURE_32 ('e', 'h', 'c', 'i')\r
 \r
-typedef struct _LIST_HEAD {\r
-  struct _LIST_HEAD *pre;\r
-  struct _LIST_HEAD *next;\r
-} LIST_HEAD;\r
-\r
-typedef struct _EHCI_ASYNC_REQUEST {\r
+struct _EHCI_ASYNC_REQUEST {\r
   UINT8                           TransferType;\r
   EFI_ASYNC_USB_TRANSFER_CALLBACK CallBackFunc;\r
   VOID                            *Context;\r
   EHCI_ASYNC_REQUEST              *Prev;\r
   EHCI_ASYNC_REQUEST              *Next;\r
   EHCI_QH_ENTITY                  *QhPtr;\r
-} EHCI_ASYNC_REQUEST;\r
+};\r
 \r
 typedef struct _MEMORY_MANAGE_HEADER {\r
   UINT8                         *BitArrayPtr;\r