1. Fixed tools_def.template to meet ICC build for IA32

[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 25332f432f90285a6021c37eb5046150e5da79c5..cb54f037479ea80c5b91a9b32a5815dbcd12ae3a 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -98,7 +98,7 @@ UsbHubCtrlClearPortFeature (
              USB_HUB_TARGET_PORT,\r
              USB_HUB_REQ_CLEAR_FEATURE,\r
              Feature,\r
-             Port + 1,\r
+             (UINT16) (Port + 1),\r
              NULL,\r
              0\r
              );\r
@@ -140,8 +140,8 @@ UsbHubCtrlClearTTBuffer (
   //\r
   // Check USB2.0 spec page 424 for wValue's encoding\r
   //\r
-  Value = (EpNum & 0x0F) | (DevAddr << 4) |\r
-          ((EpType & 0x03) << 11) | ((EpNum & 0x80) << 15);\r
+  Value = (UINT16) ((EpNum & 0x0F) | (DevAddr << 4) |\r
+          ((EpType & 0x03) << 11) | ((EpNum & 0x80) << 15));\r
 \r
   Status = UsbCtrlRequest (\r
              HubDev,\r
@@ -150,7 +150,7 @@ UsbHubCtrlClearTTBuffer (
              USB_HUB_TARGET_PORT,\r
              USB_HUB_REQ_CLEAR_TT,\r
              Value,\r
-             Port + 1,\r
+             (UINT16) (Port + 1),\r
              NULL,\r
              0\r
              );\r
@@ -265,7 +265,7 @@ UsbHubCtrlGetPortStatus (
              USB_HUB_TARGET_PORT,\r
              USB_HUB_REQ_GET_STATUS,\r
              0,\r
-             Port + 1,\r
+             (UINT16) (Port + 1),\r
              State,\r
              4\r
              );\r
@@ -300,7 +300,7 @@ UsbHubCtrlResetTT (
              USB_HUB_TARGET_HUB,\r
              USB_HUB_REQ_RESET_TT,\r
              0,\r
-             Port + 1,\r
+             (UINT16) (Port + 1),\r
              NULL,\r
              0\r
              );\r
@@ -376,7 +376,7 @@ UsbHubCtrlSetPortFeature (
              USB_HUB_TARGET_PORT,\r
              USB_HUB_REQ_SET_FEATURE,\r
              Feature,\r
-             Port + 1,\r
+             (UINT16) (Port + 1),\r
              NULL,\r
              0\r
              );\r
@@ -744,7 +744,7 @@ UsbHubInit (
   // for both gang/individual powered hubs.\r
   //\r
   for (Index = 0; Index < HubDesc.NumPorts; Index++) {\r
-    UsbHubCtrlSetPortFeature (HubIf->Device, Index, USB_HUB_PORT_POWER);\r
+    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
@@ -852,7 +852,7 @@ UsbHubSetPortFeature (
 {\r
   EFI_STATUS              Status;\r
 \r
-  Status = UsbHubCtrlSetPortFeature (HubIf->Device, Port, Feature);\r
+  Status = UsbHubCtrlSetPortFeature (HubIf->Device, Port, (UINT8) Feature);\r
 \r
   return Status;\r
 }\r
@@ -879,7 +879,7 @@ UsbHubClearPortFeature (
 {\r
   EFI_STATUS              Status;\r
 \r
-  Status = UsbHubCtrlClearPortFeature (HubIf->Device, Port, Feature);\r
+  Status = UsbHubCtrlClearPortFeature (HubIf->Device, Port, (UINT8) Feature);\r
 \r
   return Status;\r
 }\r
@@ -907,7 +907,7 @@ UsbHubResetPort (
   UINTN                   Index;\r
   EFI_STATUS              Status;\r
 \r
-  Status  = UsbHubSetPortFeature (HubIf, Port, USB_HUB_PORT_RESET);\r
+  Status  = UsbHubSetPortFeature (HubIf, Port, (EFI_USB_PORT_FEATURE) USB_HUB_PORT_RESET);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1121,7 +1121,7 @@ UsbRootHubClearPortChange (
     Map = &mRootHubFeatureMap[Index];\r
 \r
     if (USB_BIT_IS_SET (PortState.PortChangeStatus, Map->ChangedBit)) {\r
-      UsbHcClearRootHubPortFeature (HubIf->Device->Bus, Port, Map->Feature);\r
+      UsbHcClearRootHubPortFeature (HubIf->Device->Bus, Port, (EFI_USB_PORT_FEATURE) Map->Feature);\r
     }\r
   }\r
 }\r