MdeModulePkg/SdMmcPciHcDxe: Fix VS2015 IA32 NOOPT build failure

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1425

This commit will resolve the VS2015 IA32 NOOPT build failure within
SdMmcPciHcDxe.

More specifically, this commit will use BaseLib API RShiftU64() to perform
right-shift operations for UINT64 type operators.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Bi Dandan <dandan.bi@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
index 6086720fa145f3f14d7a931722f5e1d7a09eaae1..5aec8c69927abb5e051bafaf189895d10db292cf 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
@@ -1505,7 +1505,7 @@ BuildAdmaDescTable (
         Trb->Adma32Desc[Index].Valid = 1;\r
         Trb->Adma32Desc[Index].Act   = 2;\r
         if (DataLength26) {\r
-          Trb->Adma32Desc[Index].UpperLength = (UINT16)(Remaining >> 16);\r
+          Trb->Adma32Desc[Index].UpperLength = (UINT16)RShiftU64 (Remaining, 16);\r
         }\r
         Trb->Adma32Desc[Index].LowerLength = (UINT16)(Remaining & MAX_UINT16);\r
         Trb->Adma32Desc[Index].Address = (UINT32)Address;\r
@@ -1524,11 +1524,11 @@ BuildAdmaDescTable (
         Trb->Adma64Desc[Index].Valid = 1;\r
         Trb->Adma64Desc[Index].Act   = 2;\r
         if (DataLength26) {\r
-          Trb->Adma64Desc[Index].UpperLength  = (UINT16)(Remaining >> 16);\r
+          Trb->Adma64Desc[Index].UpperLength  = (UINT16)RShiftU64 (Remaining, 16);\r
         }\r
         Trb->Adma64Desc[Index].LowerLength  = (UINT16)(Remaining & MAX_UINT16);\r
         Trb->Adma64Desc[Index].LowerAddress = (UINT32)Address;\r
-        Trb->Adma64Desc[Index].UpperAddress = (UINT32)(Address >> 32);\r
+        Trb->Adma64Desc[Index].UpperAddress = (UINT32)RShiftU64 (Address, 32);\r
         break;\r
       } else {\r
         Trb->Adma64Desc[Index].Valid = 1;\r
@@ -1538,7 +1538,7 @@ BuildAdmaDescTable (
         }\r
         Trb->Adma64Desc[Index].LowerLength  = 0;\r
         Trb->Adma64Desc[Index].LowerAddress = (UINT32)Address;\r
-        Trb->Adma64Desc[Index].UpperAddress = (UINT32)(Address >> 32);\r
+        Trb->Adma64Desc[Index].UpperAddress = (UINT32)RShiftU64 (Address, 32);\r
       }\r
     }\r
 \r