Support ICC build .

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbBusDxe / UsbHub.c

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 795f545b7712eb59865756eeb6b45abbdd2195d5..171a780d0ccba1bf4b144342091187672578fbf6 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -604,11 +604,11 @@ UsbOnHubInterrupt (
 #define USB_HUB_MAP_SIZE  5\r
 \r
 USB_CHANGE_FEATURE_MAP  mHubFeatureMap[USB_HUB_MAP_SIZE] = {\r
-  {USB_PORT_STAT_C_CONNECTION,  USB_HUB_C_PORT_CONNECT},\r
-  {USB_PORT_STAT_C_ENABLE,      USB_HUB_C_PORT_ENABLE},\r
-  {USB_PORT_STAT_C_SUSPEND,     USB_HUB_C_PORT_SUSPEND},\r
-  {USB_PORT_STAT_C_OVERCURRENT, USB_HUB_C_PORT_OVER_CURRENT},\r
-  {USB_PORT_STAT_C_RESET,       USB_HUB_C_PORT_RESET},\r
+  {USB_PORT_STAT_C_CONNECTION,  EfiUsbPortConnectChange},\r
+  {USB_PORT_STAT_C_ENABLE,      EfiUsbPortEnableChange},\r
+  {USB_PORT_STAT_C_SUSPEND,     EfiUsbPortSuspendChange},\r
+  {USB_PORT_STAT_C_OVERCURRENT, EfiUsbPortOverCurrentChange},\r
+  {USB_PORT_STAT_C_RESET,       EfiUsbPortResetChange},\r
 };\r
 \r
 #define USB_ROOT_HUB_MAP_SIZE 5\r
@@ -745,7 +745,7 @@ UsbHubInit (
     UsbHubCtrlSetPortFeature (HubIf->Device, Index, (EFI_USB_PORT_FEATURE) USB_HUB_PORT_POWER);\r
   }\r
 \r
-  gBS->Stall (HubDesc.PwrOn2PwrGood * 2 * USB_STALL_1_MS);\r
+  gBS->Stall (HubDesc.PwrOn2PwrGood * USB_SET_PORT_POWER_STALL);\r
   UsbHubAckHubStatus (HubIf->Device);\r
 \r
   DEBUG (( EFI_D_INFO, "UsbHubInit: hub %d initialized\n", HubDev->Address));\r
@@ -822,7 +822,7 @@ UsbHubClearPortChange (
     Map = &mHubFeatureMap[Index];\r
 \r
     if (USB_BIT_IS_SET (PortState.PortChangeStatus, Map->ChangedBit)) {\r
-      UsbHubCtrlClearPortFeature (HubIf->Device, Port, Map->Feature);\r
+      UsbHubCtrlClearPortFeature (HubIf->Device, Port, (UINT16) Map->Feature);\r
     }\r
   }\r
 }\r
@@ -915,14 +915,14 @@ UsbHubResetPort (
   // Drive the reset signal for at least 10ms. Check USB 2.0 Spec\r
   // section 7.1.7.5 for timing requirements.\r
   //\r
-  gBS->Stall (20 * USB_STALL_1_MS);\r
+  gBS->Stall (USB_SET_PORT_RESET_STALL);\r
 \r
   //\r
   // USB hub will clear RESET bit if reset is actually finished.\r
   //\r
   ZeroMem (&PortState, sizeof (EFI_USB_PORT_STATUS));\r
 \r
-  for (Index = 0; Index < 20; Index++) {\r
+  for (Index = 0; Index < USB_WAIT_PORT_STS_CHANGE_LOOP; Index++) {\r
     Status = UsbHubGetPortStatus (HubIf, Port, &PortState);\r
 \r
     if (!EFI_ERROR (Status) &&\r
@@ -931,7 +931,7 @@ UsbHubResetPort (
       return EFI_SUCCESS;\r
     }\r
 \r
-    gBS->Stall (5 * USB_STALL_1_MS);\r
+    gBS->Stall (USB_WAIT_PORT_STS_CHANGE_STALL);\r
   }\r
 \r
   return EFI_TIMEOUT;\r
@@ -1228,7 +1228,7 @@ UsbRootHubResetPort (
   // Drive the reset signal for at least 50ms. Check USB 2.0 Spec\r
   // section 7.1.7.5 for timing requirements.\r
   //\r
-  gBS->Stall (50 * USB_STALL_1_MS);\r
+  gBS->Stall (USB_SET_ROOT_PORT_RESET_STALL);\r
 \r
   Status = UsbHcClearRootHubPortFeature (Bus, Port, EfiUsbPortReset);\r
 \r
@@ -1237,7 +1237,7 @@ UsbRootHubResetPort (
     return Status;\r
   }\r
 \r
-  gBS->Stall (USB_STALL_1_MS);\r
+  gBS->Stall (USB_CLR_ROOT_PORT_RESET_STALL);\r
 \r
   //\r
   // USB host controller won't clear the RESET bit until\r
@@ -1245,7 +1245,7 @@ UsbRootHubResetPort (
   //\r
   ZeroMem (&PortState, sizeof (EFI_USB_PORT_STATUS));\r
 \r
-  for (Index = 0; Index < USB_HUB_LOOP; Index++) {\r
+  for (Index = 0; Index < USB_WAIT_PORT_STS_CHANGE_LOOP; Index++) {\r
     Status = UsbHcGetRootHubPortStatus (Bus, Port, &PortState);\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -1256,11 +1256,11 @@ UsbRootHubResetPort (
       break;\r
     }\r
 \r
-    gBS->Stall (10 * USB_STALL_1_MS);\r
+    gBS->Stall (USB_WAIT_PORT_STS_CHANGE_STALL);\r
   }\r
 \r
-  if (Index == USB_HUB_LOOP) {\r
-    DEBUG (( EFI_D_ERROR, "UsbRootHubResetPort: reset not finished in time on port %d\n", Port));\r
+  if (Index == USB_WAIT_PORT_STS_CHANGE_LOOP) {\r
+    DEBUG ((EFI_D_ERROR, "UsbRootHubResetPort: reset not finished in time on port %d\n", Port));\r
     return EFI_TIMEOUT;\r
   }\r
 \r
@@ -1286,7 +1286,7 @@ UsbRootHubResetPort (
         return Status;\r
       }\r
 \r
-      gBS->Stall (20 * USB_STALL_1_MS);\r
+      gBS->Stall (USB_SET_ROOT_PORT_ENABLE_STALL);\r
     }\r
   }\r
 \r