Fixed build error reported by ICC and GCC

Signed-off-by: erictian
Reviewed-by: li-elvin
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12209 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index 61c4b2427fa3aebff6d818b85ad4eaee7094883a..30eb3ea916a30ef74bcc6da3702f4ebfb3b18d4a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
@@ -829,7 +829,7 @@ XhcControlTransfer (
   // endpoint is bidirectional. XhcCreateUrb expects this\r
   // combination of Ep addr and its direction.\r
   //\r
-  Endpoint = 0 | ((TransferDirection == EfiUsbDataIn) ? 0x80 : 0);\r
+  Endpoint = (UINT8) (0 | ((TransferDirection == EfiUsbDataIn) ? 0x80 : 0));\r
   Urb = XhcCreateUrb (\r
           Xhc,\r
           XhciDevAddr,\r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
index f5e66e4f3bc546f701e8bb0bcc48b893e39607b7..d4c22d094eea0b6ba3b55a1b014c6b37a09e59c8 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
@@ -362,7 +362,7 @@ XhcReadRuntimeReg64 (
 \r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "XhcReadRuntimeReg64: Pci Io Read error - %r at %d\n", Status, Offset));\r
-    Data = 0xFFFFFFFFFFFFFFFF;\r
+    Data = 0xFFFFFFFFFFFFFFFFULL;\r
   }\r
 \r
   return Data;\r
@@ -700,7 +700,7 @@ XhcGetLegSupCapAddr (
     //\r
     // If not, then traverse all of the ext capability registers till finding out it.\r
     //\r
-    NextExtCapReg = (Data >> 8) & 0xFF;\r
+    NextExtCapReg = (UINT8)((Data >> 8) & 0xFF);\r
     ExtCapOffset += (NextExtCapReg << 2);\r
   } while (NextExtCapReg != 0);\r
 \r

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index f160a1d2ec7d864f2b6bed252dd1b458d87d61bc..370b8ea44178ee361c8aaf7c0269830b76a2cd81 100644 (file)
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -325,7 +325,7 @@ XhcCreateUrb (
 \r
   Ep            = &Urb->Ep;\r
   Ep->DevAddr   = DevAddr;\r
-  Ep->EpAddr    = EpAddr & 0x0F;\r
+  Ep->EpAddr    = (UINT8)(EpAddr & 0x0F);\r
   Ep->Direction = ((EpAddr & 0x80) != 0) ? EfiUsbDataIn : EfiUsbDataOut;\r
   Ep->DevSpeed  = DevSpeed;\r
   Ep->MaxPacket = MaxPacket;\r
@@ -352,7 +352,6 @@ XhcCreateUrb (
 \r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 XhcCreateTransferTrb (\r
   IN USB_XHCI_DEV               *Xhc,\r
   IN URB                        *Urb\r
@@ -369,7 +368,7 @@ XhcCreateTransferTrb (
   UINTN                         TrbNum;\r
 \r
   SlotId    = XhcDevAddrToSlotId(Urb->Ep.DevAddr);\r
-  Dci       = XhcEndpointToDci (Urb->Ep.EpAddr, Urb->Ep.Direction);\r
+  Dci       = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   EPRing    = (TRANSFER_RING *)(UINTN) UsbDevContext[SlotId].EndpointTransferRing[Dci-1];\r
   Urb->Ring = EPRing;\r
   OutputDevContxt = (DEVICE_CONTEXT *)(UINTN) Xhc->DCBAA[SlotId];\r
@@ -610,7 +609,7 @@ XhcInitSched (
   //\r
   MaxScratchpadBufs      = ((Xhc->HcSParams2.Data.ScratchBufHi) << 5) | (Xhc->HcSParams2.Data.ScratchBufLo);\r
   Xhc->MaxScratchpadBufs = MaxScratchpadBufs;\r
-  ASSERT (MaxScratchpadBufs >= 0 && MaxScratchpadBufs <= 1023);\r
+  ASSERT (MaxScratchpadBufs <= 1023);\r
   if (MaxScratchpadBufs != 0) {\r
     ScratchBuf      = AllocateAlignedZeroPool(MaxScratchpadBufs * sizeof (UINT64), Xhc->PageSize);\r
     ASSERT (ScratchBuf != NULL);\r
@@ -633,8 +632,8 @@ XhcInitSched (
   // a 64-bit address pointing to where the Device Context Base Address Array is located.\r
   //\r
   Xhc->DCBAA     = (UINT64 *)(UINTN)Dcbaa;\r
-  XhcWriteOpReg64 (Xhc, XHC_DCBAAP_OFFSET, (UINT64)Xhc->DCBAA);\r
-  DEBUG ((EFI_D_INFO, "XhcInitSched:DCBAA=0x%x\n", (UINT64)Xhc->DCBAA));\r
+  XhcWriteOpReg64 (Xhc, XHC_DCBAAP_OFFSET, (UINT64)(UINTN)Xhc->DCBAA);\r
+  DEBUG ((EFI_D_INFO, "XhcInitSched:DCBAA=0x%x\n", (UINT64)(UINTN)Xhc->DCBAA));\r
 \r
   //\r
   // Define the Command Ring Dequeue Pointer by programming the Command Ring Control Register\r
@@ -705,7 +704,7 @@ XhcRecoverHaltedEndpoint (
 \r
   Status     = EFI_SUCCESS;\r
   SlotId     = XhcDevAddrToSlotId(Urb->Ep.DevAddr);\r
-  Dci        = XhcEndpointToDci(Urb->Ep.EpAddr, Urb->Ep.Direction);\r
+  Dci        = XhcEndpointToDci(Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
 \r
   DEBUG ((EFI_D_INFO, "Recovery Halted Slot = %x,Dci = %x\n", SlotId, Dci));\r
 \r
@@ -760,7 +759,6 @@ XhcRecoverHaltedEndpoint (
 \r
 **/\r
 VOID\r
-EFIAPI\r
 CreateEventRing (\r
   IN  USB_XHCI_DEV          *Xhc,\r
   IN  UINT8                 EventInterrupter,\r
@@ -811,7 +809,7 @@ CreateEventRing (
   XhcWriteRuntimeReg64 (\r
     Xhc,\r
     XHC_ERDP_OFFSET + (32 * EventRing->EventInterrupter),\r
-    (UINT64)EventRing->EventRingDequeue\r
+    (UINT64)(UINTN)EventRing->EventRingDequeue\r
     );\r
   //\r
   // Program the Interrupter Event Ring Segment Table Base Address (ERSTBA) register(5.5.2.3.2)\r
@@ -819,7 +817,7 @@ CreateEventRing (
   XhcWriteRuntimeReg64 (\r
     Xhc,\r
     XHC_ERSTBA_OFFSET + (32 * EventRing->EventInterrupter),\r
-    (UINT64) ERSTBase\r
+    (UINT64)(UINTN)ERSTBase\r
     );\r
   //\r
   // Need set IMAN IE bit to enble the ring interrupt\r
@@ -836,7 +834,6 @@ CreateEventRing (
 \r
 **/\r
 VOID\r
-EFIAPI\r
 CreateTransferRing (\r
   IN  USB_XHCI_DEV          *Xhc,\r
   IN  UINTN                 TrbNum,\r
@@ -1037,7 +1034,7 @@ XhcCheckUrbResult (
   Urb->EvtRing->EventRingDequeue = Urb->EvtTrbStart;\r
   for (Index = 0; Index < Urb->EvtRing->TrbNumber; Index++) {\r
     XhcSyncEventRing (Xhc, Urb->EvtRing);\r
-    Status = XhcCheckNewEvent (Xhc, Urb->EvtRing, &(TRB *)EvtTrb);\r
+    Status = XhcCheckNewEvent (Xhc, Urb->EvtRing, ((TRB **)&EvtTrb));\r
     if (Status == EFI_NOT_READY) {\r
       Urb->Result |= EFI_USB_ERR_TIMEOUT;\r
       goto EXIT;\r
@@ -1151,7 +1148,7 @@ XhcExecTransfer (
     Dci    = 0;\r
   } else {\r
     SlotId = XhcDevAddrToSlotId(Urb->Ep.DevAddr);\r
-    Dci    = XhcEndpointToDci(Urb->Ep.EpAddr, Urb->Ep.Direction);\r
+    Dci    = XhcEndpointToDci(Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   }\r
 \r
   Status = EFI_SUCCESS;\r
@@ -1459,7 +1456,7 @@ XhcEndpointToDci (
   if (EpAddr == 0) {\r
     return 1;\r
   } else {\r
-    Index = 2 * EpAddr;\r
+    Index = (UINT8) (2 * EpAddr);\r
     if (Direction == EfiUsbDataIn) {\r
       Index += 1;\r
     }\r
@@ -1476,7 +1473,6 @@ XhcEndpointToDci (
 \r
 **/\r
 UINT8\r
-EFIAPI\r
 XhcDevAddrToSlotId (\r
   IN  UINT8       DevAddr\r
   )\r
@@ -1613,11 +1609,11 @@ XhcSyncEventRing (
                                 XHC_ERDP_OFFSET + (32 * EvtRing->EventInterrupter)\r
                                 );\r
 \r
-  if (((UINT64) XhcDequeue & (~0x0F)) != ((UINT64) EvtRing->EventRingDequeue & (~0x0F))) {\r
+  if (((UINT64)(UINTN)XhcDequeue & (~0x0F)) != ((UINT64)(UINTN)EvtRing->EventRingDequeue & (~0x0F))) {\r
     XhcWriteRuntimeReg64 (\r
       Xhc,\r
       XHC_ERDP_OFFSET + (32 * EvtRing->EventInterrupter),\r
-      (UINT64)EvtRing->EventRingDequeue | BIT3\r
+      (UINT64)(UINTN)EvtRing->EventRingDequeue | BIT3\r
       );\r
   }\r
 \r
@@ -1782,7 +1778,7 @@ RingIntTransferDoorBell (
   UINT8                Dci;\r
 \r
   SlotId = XhcDevAddrToSlotId(Urb->Ep.DevAddr);\r
-  Dci    = XhcEndpointToDci(Urb->Ep.EpAddr, Urb->Ep.Direction);\r
+  Dci    = XhcEndpointToDci(Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   XhcRingDoorBell (Xhc, SlotId, Dci);\r
   return EFI_SUCCESS;\r
 }\r
@@ -2141,7 +2137,7 @@ XhcSetConfigCmd (
         EpDesc = (USB_ENDPOINT_DESCRIPTOR *)((UINTN)EpDesc + EpDesc->Length);\r
       }\r
 \r
-      EpAddr    = EpDesc->EndpointAddress & 0x0F;\r
+      EpAddr    = (UINT8)(EpDesc->EndpointAddress & 0x0F);\r
       Direction = (UINT8)((EpDesc->EndpointAddress & 0x80) ? EfiUsbDataIn : EfiUsbDataOut);\r
 \r
       Dci = XhcEndpointToDci (EpAddr, Direction);\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index b004212fa27bf208ff6fbeeac3eb5ddb09a24366..aacc67fef1896d57d06d2f4c038ada04a1642687 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
@@ -233,7 +233,7 @@ UsbCreateDevice (
   Device->ParentAddr  = ParentIf->Device->Address;\r
   Device->ParentIf    = ParentIf;\r
   Device->ParentPort  = ParentPort;\r
-  Device->Tier        = ParentIf->Device->Tier + 1;\r
+  Device->Tier        = (UINT8)(ParentIf->Device->Tier + 1);\r
   return Device;\r
 }\r
 \r